diff options
author | Boris Nagaev <bnagaev@gmail.com> | 2016-01-09 23:50:13 (GMT) |
---|---|---|
committer | Boris Nagaev <bnagaev@gmail.com> | 2016-01-09 23:50:13 (GMT) |
commit | b39f6d2b78c98a00980601fdb735b150d0fe8a92 (patch) | |
tree | e30b4c6a9329efa9d686581fa6ef00162b506c8b /src | |
parent | b4ad5b87baa697e14251318ca9340d3301e41c4a (diff) | |
download | mxe-b39f6d2b78c98a00980601fdb735b150d0fe8a92.zip mxe-b39f6d2b78c98a00980601fdb735b150d0fe8a92.tar.gz mxe-b39f6d2b78c98a00980601fdb735b150d0fe8a92.tar.bz2 |
nsis: unify patch
$ ./tools/patch-tool-mxe init nsis
$ ./tools/patch-tool-mxe import nsis
$ ./tools/patch-tool-mxe export nsis
Diffstat (limited to 'src')
-rw-r--r-- | src/nsis-1-fixes.patch | 71 |
1 files changed, 30 insertions, 41 deletions
diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index ce53524..1fd99d9 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -1,16 +1,18 @@ This file is part of MXE. See index.html for further information. -From 1cc3dd0dfd47bab82e06be916f9e57ef783406f9 Mon Sep 17 00:00:00 2001 +Contains ad hoc patches for cross building. + +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Mark Brand <mabrand@mabrand.nl> Date: Sun, 12 Aug 2012 12:33:26 +0200 -Subject: [PATCH 1/4] explicit mingw cross prefix +Subject: [PATCH] explicit mingw cross prefix This patch has been taken from: http://sourceforge.net/tracker/index.php?func=detail&aid=3305366&group_id=22049&atid=373085 diff --git a/SCons/Tools/crossmingw.py b/SCons/Tools/crossmingw.py -index d27e01c..fef9150 100755 +index 1111111..2222222 100755 --- a/SCons/Tools/crossmingw.py +++ b/SCons/Tools/crossmingw.py @@ -61,6 +61,9 @@ prefixes = SCons.Util.Split(""" @@ -24,7 +26,7 @@ index d27e01c..fef9150 100755 # First search in the SCons path and then the OS path: if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'): diff --git a/SConstruct b/SConstruct -index 80872bc..4f113dd 100755 +index 1111111..2222222 100755 --- a/SConstruct +++ b/SConstruct @@ -59,6 +59,7 @@ doc = [ @@ -44,18 +46,15 @@ index 80872bc..4f113dd 100755 Export('defenv') --- -2.1.0 - -From 7df0fa80a65279ee7d99da8ec6abdddff7e040b0 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: freeman <free.man.uu@gmail.com> Date: Sun, 12 Aug 2012 12:36:39 +0200 -Subject: [PATCH 2/4] add missing header +Subject: [PATCH] add missing header diff --git a/Source/util.h b/Source/util.h -index 4259a6a..664923e 100755 +index 1111111..2222222 100755 --- a/Source/util.h +++ b/Source/util.h @@ -25,6 +25,7 @@ @@ -66,20 +65,17 @@ index 4259a6a..664923e 100755 #endif --- -2.1.0 - -From 9a40694c9177db6fa5db3f28d7d68c042d0a6144 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Fri, 3 May 2013 17:28:44 +1000 -Subject: [PATCH 3/4] Enable native 64-bit build +Subject: [PATCH] Enable native 64-bit build Taken from: http://anonscm.debian.org/gitweb/?p=collab-maint/nsis.git;a=blob;f=debian/patches/makensis_native_64bit.patch;h=2256a0e193db894dd99507ac0de66f8ae060b46b;hb=HEAD diff --git a/SCons/Config/gnu b/SCons/Config/gnu -index a1f917f..adfcbd1 100755 +index 1111111..2222222 100755 --- a/SCons/Config/gnu +++ b/SCons/Config/gnu @@ -95,8 +95,6 @@ makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor @@ -110,7 +106,7 @@ index a1f917f..adfcbd1 100755 ### weird GCC requirements diff --git a/Source/DialogTemplate.cpp b/Source/DialogTemplate.cpp -index 109a1d7..f821a05 100755 +index 1111111..2222222 100755 --- a/Source/DialogTemplate.cpp +++ b/Source/DialogTemplate.cpp @@ -74,7 +74,7 @@ void ReadVarLenArr(LPBYTE &seeker, WCHAR* &readInto, unsigned int uCodePage) { @@ -166,7 +162,7 @@ index 109a1d7..f821a05 100755 // DONE! return pbDlg; diff --git a/Source/Platform.h b/Source/Platform.h -index 52eb9bc..3cdfe32 100755 +index 1111111..2222222 100755 --- a/Source/Platform.h +++ b/Source/Platform.h @@ -53,6 +53,7 @@ typedef unsigned char UCHAR; @@ -229,7 +225,7 @@ index 52eb9bc..3cdfe32 100755 // shell folders diff --git a/Source/Plugins.cpp b/Source/Plugins.cpp -index 6872b28..90ad393 100755 +index 1111111..2222222 100755 --- a/Source/Plugins.cpp +++ b/Source/Plugins.cpp @@ -29,7 +29,7 @@ @@ -253,7 +249,7 @@ index 6872b28..90ad393 100755 const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA); const string signature = dllName + "::" + name; diff --git a/Source/ResourceEditor.cpp b/Source/ResourceEditor.cpp -index 8509414..b819f4e 100755 +index 1111111..2222222 100755 --- a/Source/ResourceEditor.cpp +++ b/Source/ResourceEditor.cpp @@ -27,20 +27,10 @@ using namespace std; @@ -386,7 +382,7 @@ index 8509414..b819f4e 100755 else { m_bHasName = true; diff --git a/Source/ResourceEditor.h b/Source/ResourceEditor.h -index 59def2e..d25be31 100755 +index 1111111..2222222 100755 --- a/Source/ResourceEditor.h +++ b/Source/ResourceEditor.h @@ -27,7 +27,7 @@ @@ -435,7 +431,7 @@ index 59def2e..d25be31 100755 private: BYTE* m_pbData; diff --git a/Source/ResourceVersionInfo.cpp b/Source/ResourceVersionInfo.cpp -index 71df19e..7ed0ccf 100755 +index 1111111..2222222 100755 --- a/Source/ResourceVersionInfo.cpp +++ b/Source/ResourceVersionInfo.cpp @@ -146,7 +146,7 @@ int GetVersionHeader (LPSTR &p, WORD &wLength, WORD &wValueLength, WORD &wType) @@ -448,7 +444,7 @@ index 71df19e..7ed0ccf 100755 return p - baseP; } diff --git a/Source/fileform.cpp b/Source/fileform.cpp -index 72296ba..e879ad5 100755 +index 1111111..2222222 100755 --- a/Source/fileform.cpp +++ b/Source/fileform.cpp @@ -149,7 +149,7 @@ void ctlcolors_writer::write(const ctlcolors *data) @@ -461,7 +457,7 @@ index 72296ba..e879ad5 100755 m_sink->write_int(data->flags); } diff --git a/Source/mmap.cpp b/Source/mmap.cpp -index 1e0be7a..562a7ed 100755 +index 1111111..2222222 100755 --- a/Source/mmap.cpp +++ b/Source/mmap.cpp @@ -322,7 +322,7 @@ void MMapFile::release(void *pView, int size) @@ -474,7 +470,7 @@ index 1e0be7a..562a7ed 100755 size += alignment; #ifdef _WIN32 diff --git a/Source/script.cpp b/Source/script.cpp -index a492051..2951d98 100755 +index 1111111..2222222 100755 --- a/Source/script.cpp +++ b/Source/script.cpp @@ -2129,7 +2129,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line) @@ -523,7 +519,7 @@ index a492051..2951d98 100755 ent.offsets[3]=add_string(line.gettoken_str(4)); ent.offsets[4]=which_token == TOK_ENUMREGKEY; diff --git a/Source/util.cpp b/Source/util.cpp -index 2c0b07f..18c31a2 100755 +index 1111111..2222222 100755 --- a/Source/util.cpp +++ b/Source/util.cpp @@ -77,9 +77,9 @@ int update_bitmap(CResourceEditor* re, WORD id, const char* filename, int width/ @@ -581,18 +577,15 @@ index 2c0b07f..18c31a2 100755 { SetLastError( 0 ); return dwResult; --- -2.1.0 - -From eb6e12dd7173f4c259fd31c9074b0c95bc567487 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Tony Theodore <tonyt@logyst.com> Date: Thu, 9 May 2013 13:08:59 +1000 -Subject: [PATCH 4/4] i686-w64-mingw32 fixes +Subject: [PATCH] i686-w64-mingw32 fixes diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp -index d8303b0..fefc8f8 100755 +index 1111111..2222222 100755 --- a/Contrib/InstallOptions/InstallerOptions.cpp +++ b/Contrib/InstallOptions/InstallerOptions.cpp @@ -13,6 +13,7 @@ @@ -640,7 +633,7 @@ index d8303b0..fefc8f8 100755 for (x = 0; x < bm.bmWidth;) { if ((*bmp & 0xFFFFFF) == keycolor) { diff --git a/Contrib/Makensisw/afxres.h b/Contrib/Makensisw/afxres.h -index d4c5e1f..16b729d 100755 +index 1111111..2222222 100755 --- a/Contrib/Makensisw/afxres.h +++ b/Contrib/Makensisw/afxres.h @@ -1,4 +1,4 @@ @@ -650,7 +643,7 @@ index d4c5e1f..16b729d 100755 #ifndef IDC_STATIC diff --git a/Contrib/Makensisw/makensisw.h b/Contrib/Makensisw/makensisw.h -index beadc3f..1479b2f 100755 +index 1111111..2222222 100755 --- a/Contrib/Makensisw/makensisw.h +++ b/Contrib/Makensisw/makensisw.h @@ -22,7 +22,7 @@ @@ -663,7 +656,7 @@ index beadc3f..1479b2f 100755 #include <commctrl.h> #include "utils.h" diff --git a/Source/SConscript b/Source/SConscript -index 505e438..f9aee9d 100755 +index 1111111..2222222 100755 --- a/Source/SConscript +++ b/Source/SConscript @@ -71,7 +71,7 @@ AddAvailableLibs(env, libs) @@ -676,7 +669,7 @@ index 505e438..f9aee9d 100755 ##### Set PCH diff --git a/Source/exehead/SConscript b/Source/exehead/SConscript -index bebdd54..2f4e490 100755 +index 1111111..2222222 100755 --- a/Source/exehead/SConscript +++ b/Source/exehead/SConscript @@ -53,7 +53,7 @@ Import('env compression solid_compression') @@ -689,7 +682,7 @@ index bebdd54..2f4e490 100755 ### Some other settings diff --git a/Source/util.cpp b/Source/util.cpp -index 18c31a2..fc9443f 100755 +index 1111111..2222222 100755 --- a/Source/util.cpp +++ b/Source/util.cpp @@ -1,15 +1,15 @@ @@ -771,7 +764,3 @@ index 18c31a2..fc9443f 100755 { return GetVxdVersion( szFile, &dwLen, lpData ); } --- -2.1.0 - - |