lib/w64devkit
1
0
Fork 0
mirror of https://github.com/skeeto/w64devkit.git synced 2026-10-23 06:08:56 +03:00
Code Activity

Upgrade to NSIS 3.13

Browse Source 
Fixes an nsExec::ExecToLog crash. makensis's default target now comes
from the build's TARGET_ARCH rather than its own pointer size, which
gives the same defaults here: amd64 in the x64 kit, x86 in the x86 kit.
Patches refreshed.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Christopher Wellons
2026-10-11 12:34:25 -04:00
parent c4d8914b04
commit db5cdb3d37
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -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 ./

8
src/nsis/cross-makensis.patch
View File

@@ -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 ###
######################################################################

4
src/nsis/no-ansi.patch
View File

@@ -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 = []