Add patch for Pyinstaller bug (CQ-1519)

Author: florianpiesche

build_conquest_python.py

@@ -758,6 +758,13 @@ def main():
                 "fullName = '/System/Library/Frameworks/OpenGL.framework/OpenGL'"),
         )
 
+    # Patch Pyinstaller to fix https://github.com/pyinstaller/pyinstaller/issues/5540
+    # The actual fix for this isn't in any of the 3.x versions, and 4.x onwards require Python 3 :(
+    if Package().linux:
+        command = ["patch", os.path.join(os.path.dirname(os.path.abspath(__file__)), "pyinstaller.patch")]
+        package_path = ConquestPythonPackage().python_base_directory / 'lib' / 'python2.7' / 'site-packages'
+        subprocess.run(command, cwd=package_path)
+
     if not Package().windows:
         bdb_env = dict(os.environ)
         bdb_env['BERKELEYDB_DIR'] = f'{ConquestPythonPackage().python_base_directory}'

pyinstaller.patch

@@ -0,0 +1,13 @@
+diff --git a/PyInstaller/depend/utils.py b/PyInstaller/depend/utils.py
+index 4776676b7..eca1e9dd8 100644
+--- a/PyInstaller/depend/utils.py
++++ b/PyInstaller/depend/utils.py
+@@ -372,6 +372,8 @@ def load_ldconfig_cache():
+     for line in text:
+         # :fixme: this assumes libary names do not contain whitespace
+         m = pattern.match(line)
++        if m is None:
++            continue
+         path = m.groups()[-1]
+         if is_freebsd:
+             # Insert `.so` at the end of the lib's basename. soname