From 92476a37880a73b98baed6a3a28d2f1867f18889 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 17 Nov 2019 20:36:40 +0100 Subject: [PATCH 1/3] dist: fix exception when module has None __path__ --- direct/src/dist/FreezeTool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/direct/src/dist/FreezeTool.py b/direct/src/dist/FreezeTool.py index 3b32fcf885..18ecbf109a 100644 --- a/direct/src/dist/FreezeTool.py +++ b/direct/src/dist/FreezeTool.py @@ -785,7 +785,7 @@ class Freezer: # already-imported modules. (Some of them might do their own # special path mangling.) for moduleName, module in list(sys.modules.items()): - if module and hasattr(module, '__path__'): + if module and getattr(module, '__path__', None) is not None: path = list(getattr(module, '__path__')) if path: modulefinder.AddPackagePath(moduleName, path[0]) From 1cfd297433871267b9a247eb3d00122928facb88 Mon Sep 17 00:00:00 2001 From: rdb Date: Sun, 17 Nov 2019 20:37:33 +0100 Subject: [PATCH 2/3] makepanda: specify freetype library after harfbuzz as well This fixes static linking of harfbuzz and freetype, which have a circular dependency on each other. --- makepanda/makepanda.py | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 9124dc3b2d..48b2ef1da9 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -948,6 +948,13 @@ if (COMPILER=="GCC"): SmartPkgEnable("JPEG", "", ("jpeg"), "jpeglib.h") SmartPkgEnable("PNG", "libpng", ("png"), "png.h", tool = "libpng-config") + # Copy freetype libraries to be specified after harfbuzz libraries as well, + # because there's a circular dependency between the two libraries. + if not PkgSkip("FREETYPE") and not PkgSkip("HARFBUZZ"): + for (opt, name) in LIBNAMES: + if opt == "FREETYPE": + LibName("HARFBUZZ", name) + if not PkgSkip("FFMPEG"): if GetTarget() == "darwin": LibName("FFMPEG", "-Wl,-read_only_relocs,suppress") From d8481e7d229349f2ddfd476dc10b030fa2b0d032 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 28 Nov 2019 22:23:03 +0100 Subject: [PATCH 3/3] Update BACKERS.md [skip ci] --- BACKERS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/BACKERS.md b/BACKERS.md index d3dcf17084..a42b006abe 100644 --- a/BACKERS.md +++ b/BACKERS.md @@ -23,12 +23,14 @@ This is a list of all the people who are contributing financially to Panda3D. I * Sam Edwards * Max Voss +* Will Nielsen ## Enthusiasts ![Benefactors](https://opencollective.com/panda3d/tiers/enthusiast.svg?avatarHeight=48&width=600) * Eric Thomson +* Kyle Roach ## Backers