From 4b6a259a63d0d52c04d5ea5b93eff230781ebab1 Mon Sep 17 00:00:00 2001 From: "Scott E. Graves" Date: Sat, 15 Aug 2026 18:59:47 -0500 Subject: [PATCH] ugraded innosetup --- docker/x86_64/mingw64 | 2 +- src/scripts/libraries.sh | 2 +- src/scripts/versions.sh | 3 ++- support/3rd_party/mingw64/innosetup-6.5.4.exe.sha256 | 1 - support/3rd_party/mingw64/innosetup-7.1.0-x64.exe.sha256 | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 support/3rd_party/mingw64/innosetup-6.5.4.exe.sha256 create mode 100644 support/3rd_party/mingw64/innosetup-7.1.0-x64.exe.sha256 diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64 index 6edbe53..ed549a6 100644 --- a/docker/x86_64/mingw64 +++ b/docker/x86_64/mingw64 @@ -1171,7 +1171,7 @@ ENV MY_INNOSETUP_VERSION=${INNOSETUP_VERSION} RUN rm -rf /root/.wine; \ wine64 reg add 'HKEY_CURRENT_USER\Software\Wine' /v ShowDotFiles /d Y \ && while [ ! -f /root/.wine/user.reg ]; do sleep 1; done; \ - wine-x11-run wine64 /3rd_party/mingw64/innosetup-${MY_INNOSETUP_VERSION}.exe /SP- /VERYSILENT /ALLUSERS /SUPPRESSMSGBOXES /DOWNLOADISCRYPT=1 + wine-x11-run wine64 /3rd_party/mingw64/innosetup-${MY_INNOSETUP_VERSION}-x64.exe.exe /SP- /VERYSILENT /ALLUSERS /SUPPRESSMSGBOXES /DOWNLOADISCRYPT=1 ARG UID=1000 ARG GID=1000 diff --git a/src/scripts/libraries.sh b/src/scripts/libraries.sh index d847bd6..ed729cd 100755 --- a/src/scripts/libraries.sh +++ b/src/scripts/libraries.sh @@ -115,7 +115,7 @@ PROJECT_DOWNLOADS[FREETYPE2]="https://download.savannah.gnu.org/releases/freetyp PROJECT_DOWNLOADS[GCC]="https://mirrorservice.org/sites/sourceware.org/pub/gcc/releases/gcc-${PROJECT_VERSIONS[GCC]}/gcc-${PROJECT_VERSIONS[GCC]}.tar.gz;gcc-${PROJECT_VERSIONS[GCC]}.tar.gz;3rd_party/mingw64" PROJECT_DOWNLOADS[GTEST]="https://github.com/google/googletest/archive/refs/tags/v${PROJECT_VERSIONS[GTEST]}.tar.gz;googletest-${PROJECT_VERSIONS[GTEST]}.tar.gz;3rd_party" PROJECT_DOWNLOADS[ICU]="https://github.com/unicode-org/icu/archive/refs/tags/release-${PROJECT_VERSIONS[ICU]}.tar.gz;icu-release-${PROJECT_VERSIONS[ICU]}.tar.gz;3rd_party/mingw64" -PROJECT_DOWNLOADS[INNOSETUP]="https://files.jrsoftware.org/is/6/innosetup-${PROJECT_VERSIONS[INNOSETUP]}.exe;innosetup-${PROJECT_VERSIONS[INNOSETUP]}.exe;3rd_party/mingw64" +PROJECT_DOWNLOADS[INNOSETUP]="https://github.com/jrsoftware/issrc/releases/download/is-${PROJECT_VERSIONS[INNOSETUP2]}/innosetup-${PROJECT_VERSIONS[INNOSETUP]}-x64.exe;innosetup-${PROJECT_VERSIONS[INNOSETUP]}-x64.exe;3rd_party/mingw64" PROJECT_DOWNLOADS[JSON]="https://github.com/nlohmann/json/archive/refs/tags/v${PROJECT_VERSIONS[JSON]}.tar.gz;json-${PROJECT_VERSIONS[JSON]}.tar.gz;3rd_party" PROJECT_DOWNLOADS[LIBBITCOIN_SYSTEM]="https://github.com/libbitcoin/libbitcoin-system/archive/refs/tags/v${PROJECT_VERSIONS[LIBBITCOIN_SYSTEM]}.tar.gz;libbitcoin-system-${PROJECT_VERSIONS[LIBBITCOIN_SYSTEM]}.tar.gz;3rd_party" PROJECT_DOWNLOADS[LIBDSM]="https://github.com/videolabs/libdsm/archive/refs/tags/v${PROJECT_VERSIONS[LIBDSM]}.tar.gz;libdsm-${PROJECT_VERSIONS[LIBDSM]}.tar.gz;3rd_party" diff --git a/src/scripts/versions.sh b/src/scripts/versions.sh index 7a00c59..65e485d 100755 --- a/src/scripts/versions.sh +++ b/src/scripts/versions.sh @@ -24,7 +24,8 @@ PROJECT_VERSIONS[GCC]="15.2.0" PROJECT_VERSIONS[GTEST]="1.17.0" PROJECT_VERSIONS[GTKMM]="3.0" PROJECT_VERSIONS[ICU]="76-1" -PROJECT_VERSIONS[INNOSETUP]="6.5.4" +PROJECT_VERSIONS[INNOSETUP]="7.1.0" +PROJECT_VERSIONS[INNOSETUP2]="7_1_0" PROJECT_VERSIONS[JSON]="3.12.0" PROJECT_VERSIONS[LIBBITCOIN_SYSTEM]="3.8.0" PROJECT_VERSIONS[LIBDSM]="0.4.3" diff --git a/support/3rd_party/mingw64/innosetup-6.5.4.exe.sha256 b/support/3rd_party/mingw64/innosetup-6.5.4.exe.sha256 deleted file mode 100644 index 44601cf..0000000 --- a/support/3rd_party/mingw64/innosetup-6.5.4.exe.sha256 +++ /dev/null @@ -1 +0,0 @@ -fa73bf47a4da250d185d07561c2bfda387e5e20db77e4570004cf6a133cc10b1 innosetup-6.5.4.exe diff --git a/support/3rd_party/mingw64/innosetup-7.1.0-x64.exe.sha256 b/support/3rd_party/mingw64/innosetup-7.1.0-x64.exe.sha256 new file mode 100644 index 0000000..40c17cf --- /dev/null +++ b/support/3rd_party/mingw64/innosetup-7.1.0-x64.exe.sha256 @@ -0,0 +1 @@ +0362a383ed217d4c4239b5933866dd96d3eb2102737da92f80f6057a4b40df2f ./innosetup-7.1.0-x64.exe