From 5d462f9555198770e6ef9eba126c1574662d7431 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 12 Jul 2018 18:33:04 +0200 Subject: [PATCH] win binaries: bump python version to 3.6.6 --- contrib/build-wine/build-electrum-git.sh | 2 +- contrib/build-wine/deterministic.spec | 2 +- contrib/build-wine/prepare-wine.sh | 7 ++++++- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/contrib/build-wine/build-electrum-git.sh b/contrib/build-wine/build-electrum-git.sh index 86897069a..1e8ffcd11 100755 --- a/contrib/build-wine/build-electrum-git.sh +++ b/contrib/build-wine/build-electrum-git.sh @@ -1,7 +1,7 @@ #!/bin/bash NAME_ROOT=electrum -PYTHON_VERSION=3.5.4 +PYTHON_VERSION=3.6.6 # These settings probably don't need any change export WINEPREFIX=/opt/wine64 diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec index 091cea86c..7aac78732 100644 --- a/contrib/build-wine/deterministic.spec +++ b/contrib/build-wine/deterministic.spec @@ -10,7 +10,7 @@ for i, x in enumerate(sys.argv): else: raise Exception('no name') -PYTHON_VERSION = '3.5.4' +PYTHON_VERSION = '3.6.6' PYHOME = 'c:/python' + PYTHON_VERSION home = 'C:\\electrum\\' diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index 4af3c9f52..95ef980da 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -13,7 +13,7 @@ LIBUSB_FILENAME=libusb-1.0.22.7z LIBUSB_URL=https://prdownloads.sourceforge.net/project/libusb/libusb-1.0/libusb-1.0.22/$LIBUSB_FILENAME?download LIBUSB_SHA256=671f1a420757b4480e7fadc8313d6fb3cbb75ca00934c417c1efa6e77fb8779b -PYTHON_VERSION=3.5.4 +PYTHON_VERSION=3.6.6 ## These settings probably don't need change export WINEPREFIX=/opt/wine64 @@ -86,6 +86,11 @@ echo "done" wine 'wineboot' +# HACK to work around https://bugs.winehq.org/show_bug.cgi?id=42474#c22 +# needed for python 3.6+ +rm -f /opt/wine-stable/lib/wine/fakedlls/api-ms-win-core-path-l1-1-0.dll +rm -f /opt/wine-stable/lib/wine/api-ms-win-core-path-l1-1-0.dll.so + cd /tmp/electrum-build # Install Python