From 02b535a5560547dabc2e19aaeba5886a9dabfcdd Mon Sep 17 00:00:00 2001
From: falkTX <falktx@falktx.com>
Date: Thu, 31 Dec 2020 13:31:05 +0000
Subject: [PATCH] Alternative download url for pyqt5, make some libs optional

---
 bootstrap-carla.sh | 48 ++++++++++++++++++++++++++++++----------------
 setup/versions.sh  |  1 +
 2 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/bootstrap-carla.sh b/bootstrap-carla.sh
index 76aa945..10747f1 100755
--- a/bootstrap-carla.sh
+++ b/bootstrap-carla.sh
@@ -142,7 +142,13 @@ build_pyqt sip "${SIP_VERSION}" "${SIP_EXTRAFLAGS}"
 # ---------------------------------------------------------------------------------------------------------------------
 # pyqt5
 
-download PyQt5_gpl "${PYQT5_VERSION}" "https://files.kde.org/krita/build/dependencies"
+if [ "${PYQT5_VERSION}" = "5.13.1" ]; then
+    PYQT5_DOWNLOAD_URL="https://files.kde.org/krita/build/dependencies"
+else
+    PYQT5_DOWNLOAD_URL="http://sourceforge.net/projects/pyqt/files/PyQt5/PyQt-${PYQT5_VERSION}"
+fi
+
+download PyQt5_gpl "${PYQT5_VERSION}" "${PYQT5_DOWNLOAD_URL}"
 build_pyqt PyQt5_gpl "${PYQT5_VERSION}" "--concatenate --confirm-license -c"
 
 # ---------------------------------------------------------------------------------------------------------------------
@@ -152,36 +158,46 @@ download pyliblo "${PYLIBLO_VERSION}" "http://das.nasophon.de/download"
 build_python pyliblo "${PYLIBLO_VERSION}"
 
 # ---------------------------------------------------------------------------------------------------------------------
-# setuptools_scm
+# setuptools_scm (optional)
 
-download setuptools_scm "${SETUPTOOLS_SCM_VERSION}" "https://files.pythonhosted.org/packages/ed/b6/979bfa7b81878b2b4475dde092aac517e7f25dd33661796ec35664907b31"
-build_python setuptools_scm "${SETUPTOOLS_SCM_VERSION}"
+if [ -n "${SETUPTOOLS_SCM_VERSION}" ]; then
+    download setuptools_scm "${SETUPTOOLS_SCM_VERSION}" "https://files.pythonhosted.org/packages/ed/b6/979bfa7b81878b2b4475dde092aac517e7f25dd33661796ec35664907b31"
+    build_python setuptools_scm "${SETUPTOOLS_SCM_VERSION}"
+fi
 
 # ---------------------------------------------------------------------------------------------------------------------
-# toml
+# toml (optional)
 
-download toml "${TOML_VERSION}" "https://files.pythonhosted.org/packages/be/ba/1f744cdc819428fc6b5084ec34d9b30660f6f9daaf70eead706e3203ec3c"
-build_python toml "${TOML_VERSION}"
+if [ -n "${TOML_VERSION}" ]; then
+    download toml "${TOML_VERSION}" "https://files.pythonhosted.org/packages/be/ba/1f744cdc819428fc6b5084ec34d9b30660f6f9daaf70eead706e3203ec3c"
+    build_python toml "${TOML_VERSION}"
+fi
 
 # ---------------------------------------------------------------------------------------------------------------------
-# zipp
+# zipp (optional)
 
-download zipp "${ZIPP_VERSION}" "https://files.pythonhosted.org/packages/ce/b0/757db659e8b91cb3ea47d90350d7735817fe1df36086afc77c1c4610d559"
-build_python zipp "${ZIPP_VERSION}"
+if [ -n "${ZIPP_VERSION}" ]; then
+    download zipp "${ZIPP_VERSION}" "https://files.pythonhosted.org/packages/ce/b0/757db659e8b91cb3ea47d90350d7735817fe1df36086afc77c1c4610d559"
+    build_python zipp "${ZIPP_VERSION}"
+fi
 
 # ---------------------------------------------------------------------------------------------------------------------
-# importlib_metadata
+# importlib_metadata (optional)
 
-download importlib_metadata "${IMPORTLIB_METADATA_VERSION}" "https://files.pythonhosted.org/packages/3f/a8/16dc098b0addd1c20719c18a86e985be851b3ec1e103e703297169bb22cc"
-build_python importlib_metadata "${IMPORTLIB_METADATA_VERSION}"
+if [ -n "${IMPORTLIB_METADATA_VERSION}" ]; then
+    download importlib_metadata "${IMPORTLIB_METADATA_VERSION}" "https://files.pythonhosted.org/packages/3f/a8/16dc098b0addd1c20719c18a86e985be851b3ec1e103e703297169bb22cc"
+    build_python importlib_metadata "${IMPORTLIB_METADATA_VERSION}"
+fi
 
 # ---------------------------------------------------------------------------------------------------------------------
 # cxfreeze
 
 download cx_Freeze "${CXFREEZE_VERSION}" "https://github.com/anthony-tuininga/cx_Freeze/archive" "" "nv"
-patch_file cx_Freeze "${CXFREEZE_VERSION}" "setup.py" 's/"python%s.%s"/"python%s.%sm"/'
-patch_file cx_Freeze "${CXFREEZE_VERSION}" "setup.py" 's/extra_postargs=extraArgs,/extra_postargs=extraArgs+os.getenv("LDFLAGS").split(),/'
-patch_file cx_Freeze "${CXFREEZE_VERSION}" "cx_Freeze/macdist.py" 's/, use_builtin_types=False//'
+if [ "${CXFREEZE_VERSION}" = "5.13.1" ]; then
+    patch_file cx_Freeze "${CXFREEZE_VERSION}" "setup.py" 's/"python%s.%s"/"python%s.%sm"/'
+    patch_file cx_Freeze "${CXFREEZE_VERSION}" "setup.py" 's/extra_postargs=extraArgs,/extra_postargs=extraArgs+os.getenv("LDFLAGS").split(),/'
+    patch_file cx_Freeze "${CXFREEZE_VERSION}" "cx_Freeze/macdist.py" 's/, use_builtin_types=False//'
+fi
 build_python cx_Freeze "${CXFREEZE_VERSION}"
 
 # ---------------------------------------------------------------------------------------------------------------------
diff --git a/setup/versions.sh b/setup/versions.sh
index 024bf71..b8040b9 100644
--- a/setup/versions.sh
+++ b/setup/versions.sh
@@ -56,6 +56,7 @@ fi
 
 FILE_VERSION=5.34
 PYLIBLO_VERSION=0.9.2
+
 if [ "${MACOS_UNIVERSAL}" -eq 1 ]; then
     CXFREEZE_VERSION=6.4.2
     PYTHON_VERSION=3.9.1