From 77f75f102b14cebe315df63c2343e48999d6692e Mon Sep 17 00:00:00 2001 From: SomberNight Date: Sat, 14 Nov 2020 03:47:47 +0100 Subject: [PATCH] mac build: bundle old PyQt5 so that .app runs on macOS 11 "Big Sur" This is the time of the year Apple breaks our mac builds, as usual. mac now has its own "binaries" requirements. This allows us to use an older version of PyQt5 in the mac binaries. For some reason if we bundle newer PyQt5, the built app will not start on macOS 11 (but will on older macOS). related: #6461 in particular, see https://github.com/spesmilo/electrum/issues/6461#issuecomment-713888921 --- contrib/freeze_packages.sh | 2 +- contrib/osx/make_osx | 2 +- contrib/requirements/requirements-binaries-mac.txt | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) create mode 100644 contrib/requirements/requirements-binaries-mac.txt diff --git a/contrib/freeze_packages.sh b/contrib/freeze_packages.sh index 01ba44e40..3c66dba61 100755 --- a/contrib/freeze_packages.sh +++ b/contrib/freeze_packages.sh @@ -20,7 +20,7 @@ which virtualenv > /dev/null 2>&1 || { echo "Please install virtualenv" && exit ${SYSTEM_PYTHON} -m hashin -h > /dev/null 2>&1 || { ${SYSTEM_PYTHON} -m pip install hashin; } -for i in '' '-hw' '-binaries' '-build-wine' '-build-mac' '-build-sdist' '-build-appimage'; do +for i in '' '-hw' '-binaries' '-binaries-mac' '-build-wine' '-build-mac' '-build-sdist' '-build-appimage'; do rm -rf "$venv_dir" virtualenv -p ${SYSTEM_PYTHON} $venv_dir diff --git a/contrib/osx/make_osx b/contrib/osx/make_osx index 1d5df15da..ec8e8611f 100755 --- a/contrib/osx/make_osx +++ b/contrib/osx/make_osx @@ -136,7 +136,7 @@ python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requi || fail "Could not install hardware wallet requirements" info "Installing dependencies specific to binaries..." -python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-binaries.txt --user \ +python3 -m pip install --no-dependencies -Ir ./contrib/deterministic-build/requirements-binaries-mac.txt --user \ || fail "Could not install dependencies specific to binaries" info "Building $PACKAGE..." diff --git a/contrib/requirements/requirements-binaries-mac.txt b/contrib/requirements/requirements-binaries-mac.txt new file mode 100644 index 000000000..b965f07ad --- /dev/null +++ b/contrib/requirements/requirements-binaries-mac.txt @@ -0,0 +1,2 @@ +PyQt5<5.13.2 +cryptography>=2.1