commit d7f29374c97e6a70274ecdd1313aebf9d88915c8 parent e65b99564de4dfa16be6f7b59681392fcf50dc01 Author: ThomasV <thomasv@electrum.org> Date: Fri, 3 Nov 2017 11:16:45 +0100 Merge pull request #3185 from SomberNight/win_7_8_binaries_hotfix hotfix: pre-Windows10 binaries Diffstat:
| M | contrib/build-wine/deterministic.spec | | | 3 | +++ |
| M | contrib/build-wine/prepare-wine.sh | | | 2 | -- |
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git 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, diff --git 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/