From f563f05fd138960525e33a5631b1fcb79c0d6bc0 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 2 Nov 2017 19:01:44 +0100 Subject: [PATCH 1/2] prepare-wine: remove unnecessary DLLs --- contrib/build-wine/prepare-wine.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/contrib/build-wine/prepare-wine.sh b/contrib/build-wine/prepare-wine.sh index b0982d0f0..3dc0177d5 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -111,6 +111,4 @@ wine nsis.exe /S #cp upx*/upx.exe . # add dlls needed for pyinstaller: -cp $WINEPREFIX/drive_c/windows/system32/msvcp90.dll $WINEPREFIX/drive_c/python$PYTHON_VERSION/ -cp $WINEPREFIX/drive_c/windows/system32/msvcm90.dll $WINEPREFIX/drive_c/python$PYTHON_VERSION/ cp $WINEPREFIX/drive_c/python$PYTHON_VERSION/Lib/site-packages/PyQt5/Qt/bin/* $WINEPREFIX/drive_c/python$PYTHON_VERSION/ From ccb28e982349610efc66cb50b2258f5740414707 Mon Sep 17 00:00:00 2001 From: SomberNight Date: Thu, 2 Nov 2017 19:11:00 +0100 Subject: [PATCH 2/2] fix pre-Windows10 binaries --- contrib/build-wine/deterministic.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/contrib/build-wine/deterministic.spec b/contrib/build-wine/deterministic.spec index ba7ac2bad..96fea662f 100644 --- a/contrib/build-wine/deterministic.spec +++ b/contrib/build-wine/deterministic.spec @@ -61,6 +61,9 @@ for d in a.datas: a.datas.remove(d) break +# hotfix for #3171 (pre-Win10 binaries) +a.binaries = [x for x in a.binaries if not x[1].lower().startswith(r'c:\windows')] + pyz = PYZ(a.pure) exe = EXE(pyz, a.scripts,