diff --git a/contrib/build-wine/Dockerfile b/contrib/build-wine/Dockerfile index 41916fcfb..9e66ee1fb 100644 --- a/contrib/build-wine/Dockerfile +++ b/contrib/build-wine/Dockerfile @@ -45,10 +45,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=6.0.0~focal-1 \ - wine-stable-i386:i386=6.0.0~focal-1 \ - wine-stable:amd64=6.0.0~focal-1 \ - winehq-stable:amd64=6.0.0~focal-1 \ + wine-stable-amd64:amd64=6.0.2~focal-1 \ + wine-stable-i386:i386=6.0.2~focal-1 \ + wine-stable:amd64=6.0.2~focal-1 \ + winehq-stable:amd64=6.0.2~focal-1 \ && \ 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 index f5e372973..79fded7e3 100755 --- a/contrib/build-wine/prepare-wine.sh +++ b/contrib/build-wine/prepare-wine.sh @@ -1,13 +1,13 @@ #!/bin/bash # Please update these carefully, some versions won't work under Wine -NSIS_FILENAME=nsis-3.05-setup.exe -NSIS_URL=https://downloads.sourceforge.net/project/nsis/NSIS%203/3.05/$NSIS_FILENAME -NSIS_SHA256=1a3cc9401667547b9b9327a177b13485f7c59c2303d4b6183e7bc9e6c8d6bfdb +NSIS_FILENAME=nsis-3.08-setup.exe +NSIS_URL=https://downloads.sourceforge.net/project/nsis/NSIS%203/3.08/$NSIS_FILENAME +NSIS_SHA256=bbc76be36ecb2fc00d493c91befdaf71654226ad8a4fc4dc338458916bf224d0 -PYINSTALLER_REPO="https://github.com/SomberNight/pyinstaller.git" -PYINSTALLER_COMMIT="80ee4d613ecf75a1226b960a560ee01459e65ddb" -# ^ tag 4.2, plus a custom commit that fixes cross-compilation with MinGW +PYINSTALLER_REPO="https://github.com/pyinstaller/pyinstaller.git" +PYINSTALLER_COMMIT="6eae2c7cf93a968ddc054339e0cb3063f90d0e64" +# ^ tag 4.6 PYTHON_VERSION=3.9.7