From 5327759c3345ff3e9550cc56595c9dde0a1ab016 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Sun, 29 Mar 2015 09:43:51 +0200 Subject: nsis: mingw-w64 4.01 compatibility fix --- src/nsis-1-fixes.patch | 56 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 38 insertions(+), 18 deletions(-) diff --git a/src/nsis-1-fixes.patch b/src/nsis-1-fixes.patch index 4355b70..ac1bee8 100644 --- a/src/nsis-1-fixes.patch +++ b/src/nsis-1-fixes.patch @@ -1,12 +1,10 @@ This file is part of MXE. See index.html for further information. -Contains ad hoc patches for cross building. - -From d143dbb2e06d8597dfea89d4b9f55f44ddc6e7f1 Mon Sep 17 00:00:00 2001 -From: MXE +From 1cc3dd0dfd47bab82e06be916f9e57ef783406f9 Mon Sep 17 00:00:00 2001 +From: Mark Brand Date: Sun, 12 Aug 2012 12:33:26 +0200 -Subject: [PATCH 1/4] explicit mingw cross prefix +Subject: [PATCH 1/5] 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 @@ -47,13 +45,13 @@ index 80872bc..4f113dd 100755 Export('defenv') -- -1.8.2.2 +2.1.0 -From 2c32b56851aa15ad8460ed3dd0944ecb78b43ea9 Mon Sep 17 00:00:00 2001 -From: MXE +From 7df0fa80a65279ee7d99da8ec6abdddff7e040b0 Mon Sep 17 00:00:00 2001 +From: freeman Date: Sun, 12 Aug 2012 12:36:39 +0200 -Subject: [PATCH 2/4] add missing header +Subject: [PATCH 2/5] add missing header diff --git a/Source/util.h b/Source/util.h @@ -69,13 +67,13 @@ index 4259a6a..664923e 100755 -- -1.8.2.2 +2.1.0 -From ad29c1f6af0eba959e3bcb96992d1a709ba58aca Mon Sep 17 00:00:00 2001 -From: MXE +From 9a40694c9177db6fa5db3f28d7d68c042d0a6144 Mon Sep 17 00:00:00 2001 +From: Tony Theodore Date: Fri, 3 May 2013 17:28:44 +1000 -Subject: [PATCH 3/4] Enable native 64-bit build +Subject: [PATCH 3/5] 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 @@ -584,13 +582,13 @@ index 2c0b07f..18c31a2 100755 SetLastError( 0 ); return dwResult; -- -1.8.2.2 +2.1.0 -From 055b07791400ae22bde948f60d71e3311e25f452 Mon Sep 17 00:00:00 2001 -From: MXE +From eb6e12dd7173f4c259fd31c9074b0c95bc567487 Mon Sep 17 00:00:00 2001 +From: Tony Theodore Date: Thu, 9 May 2013 13:08:59 +1000 -Subject: [PATCH 4/4] i686-w64-mingw32 fixes +Subject: [PATCH 4/5] i686-w64-mingw32 fixes diff --git a/Contrib/InstallOptions/InstallerOptions.cpp b/Contrib/InstallOptions/InstallerOptions.cpp @@ -774,5 +772,27 @@ index 18c31a2..fc9443f 100755 return GetVxdVersion( szFile, &dwLen, lpData ); } -- -1.8.2.2 +2.1.0 + + +From 5a88cf1c8a78d9e627e6ee259ea0c09af712aac0 Mon Sep 17 00:00:00 2001 +From: Mark Brand +Date: Sun, 29 Mar 2015 09:32:40 +0200 +Subject: [PATCH 5/5] add missing include + + +diff --git a/Source/exehead/Ui.c b/Source/exehead/Ui.c +index 7fe32ac..952b87e 100755 +--- a/Source/exehead/Ui.c ++++ b/Source/exehead/Ui.c +@@ -14,6 +14,7 @@ + * warranty. + */ + ++#include + #include + #include + #include +-- +2.1.0 -- cgit v0.12