diff --git a/Dockerfile b/Dockerfile index 9ee7ec8..e2b3864 100644 --- a/Dockerfile +++ b/Dockerfile @@ -216,8 +216,8 @@ RUN mkdir aas-sign \ && tar xzf aas-sign-$AAS_SIGN_VERSION.tar.gz -C aas-sign --strip-components=1 FROM base AS dl-nsis -ARG NSIS_VERSION=3.12 \ - NSIS_SHA256=f3ed7a8e4aa2cf4e8cf47d3b563a02559e0cb4934db2662b2f9661b824e2b186 +ARG NSIS_VERSION=3.13 \ + NSIS_SHA256=a8ffe024602d46b6d766f9e1ce30c324ad2a24daeacd3efc2642d436a0c157ac WORKDIR /dl ADD --checksum=sha256:$NSIS_SHA256 \ https://downloads.sourceforge.net/project/nsis/NSIS%203/$NSIS_VERSION/nsis-$NSIS_VERSION-src.tar.bz2 ./ diff --git a/src/nsis/cross-makensis.patch b/src/nsis/cross-makensis.patch index 321878c..5f070f7 100644 --- a/src/nsis/cross-makensis.patch +++ b/src/nsis/cross-makensis.patch @@ -35,7 +35,7 @@ skip the Source/Tests SConscript. --- a/Source/build.cpp +++ b/Source/build.cpp -@@ -3742,7 +3742,9 @@ +@@ -3741,7 +3741,9 @@ } }; size_t io[] = { false, (size_t) path, pathcap }, cb; @@ -46,7 +46,7 @@ skip the Source/Tests SConscript. PROMPT_FILEPATH_DATA *p = (PROMPT_FILEPATH_DATA*) inputbuf.get(); p->Platform = (sizeof(void*) * 8) | sizeof(TCHAR), p->Reserved = 0; _tcscpy(p->Path, path); -@@ -4187,7 +4189,9 @@ +@@ -4186,7 +4188,9 @@ CEXEBuild::postbuild_cmd* CEXEBuild::postbuild_cmd::make(const TCHAR *cmdstr, int cmpop, int cmpval) { @@ -79,7 +79,7 @@ skip the Source/Tests SConscript. --- a/SConstruct +++ b/SConstruct -@@ -540,7 +540,7 @@ +@@ -542,7 +542,7 @@ ) )) # Search for import library of zlib for mingw or VisualC @@ -88,7 +88,7 @@ skip the Source/Tests SConscript. defenv['ZLIB_W32_LIB'] = os.path.dirname(str( defenv.FindFile(importlib, [ -@@ -929,20 +929,13 @@ +@@ -931,20 +931,13 @@ ####### Tests ### ###################################################################### diff --git a/src/nsis/no-ansi.patch b/src/nsis/no-ansi.patch index 0e9d643..d29c6cb 100644 --- a/src/nsis/no-ansi.patch +++ b/src/nsis/no-ansi.patch @@ -15,7 +15,7 @@ shape to the amd64 set. --- a/SConstruct +++ b/SConstruct -@@ -695,11 +695,6 @@ +@@ -697,11 +697,6 @@ if defenv['UNICODE']: BuildStub(stub, False, True) BuildStub(stub, True, True) @@ -27,7 +27,7 @@ shape to the amd64 set. defenv.DistributeStubs('Source/exehead/uninst.ico',names='uninst') -@@ -782,8 +777,6 @@ +@@ -784,8 +779,6 @@ srcpath = 'Contrib/' + plugin build_dir = '$BUILD_PREFIX/' + plugin pvariants = []