electrum

commit 001b815c18fa5557758c9496f8523453d4423c25
parent 5a1778b7fe80657dbd599149c370392d5f5ec5f5
Author: SomberNight <somber.night@protonmail.com>
Date:   Mon,  4 Feb 2019 19:19:42 +0100

wine build: upgrade wine, nsis, python

wine-specific hack no longer needed with new wine version

Diffstat:
M
contrib/build-wine/docker/Dockerfile
 | 
8
++++----
M
contrib/build-wine/prepare-wine.sh
 | 
10
+++-------

2 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/contrib/build-wine/docker/Dockerfile b/contrib/build-wine/docker/Dockerfile
@@ -31,10 +31,10 @@ RUN wget -nc https://dl.winehq.org/wine-builds/Release.key && \
     apt-add-repository https://dl.winehq.org/wine-builds/ubuntu/ && \
     apt-get update -q && \
     apt-get install -qy \
-        wine-stable-amd64:amd64=3.0.1~bionic \
-        wine-stable-i386:i386=3.0.1~bionic \
-        wine-stable:amd64=3.0.1~bionic \
-        winehq-stable:amd64=3.0.1~bionic
+        wine-stable-amd64:amd64=4.0~bionic \
+        wine-stable-i386:i386=4.0~bionic \
+        wine-stable:amd64=4.0~bionic \
+        winehq-stable:amd64=4.0~bionic
 
 RUN rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \
diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh
@@ -1,9 +1,9 @@
 #!/bin/bash
 
 # Please update these carefully, some versions won't work under Wine
-NSIS_FILENAME=nsis-3.03-setup.exe
+NSIS_FILENAME=nsis-3.04-setup.exe
 NSIS_URL=https://prdownloads.sourceforge.net/nsis/$NSIS_FILENAME?download
-NSIS_SHA256=bd3b15ab62ec6b0c7a00f46022d441af03277be893326f6fea8e212dc2d77743
+NSIS_SHA256=4e1db5a7400e348b1b46a4a11b6d9557fd84368e4ad3d4bc4c1be636c89638aa
 
 ZBAR_FILENAME=zbarw-20121031-setup.exe
 ZBAR_URL=https://sourceforge.net/projects/zbarw/files/$ZBAR_FILENAME/download
@@ -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.6.7
+PYTHON_VERSION=3.6.8
 
 ## These settings probably don't need change
 export WINEPREFIX=/opt/wine64
@@ -32,10 +32,6 @@ set -e
 
 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