Mercurial > mxe-octave
changeset 4118:a14a5640d12b
nsis: update to 2.50
* src/nsis.mk: update version, checksum
* src/nsis-1-fixes.patch: updated match from mxe.cc
| author | John Donoghue |
|---|---|
| date | Thu, 31 Mar 2016 07:50:33 -0400 |
| parents | 1c80153e7e8e |
| children | 0db86306c404 |
| files | src/nsis-1-fixes.patch src/nsis.mk |
| diffstat | 2 files changed, 33 insertions(+), 155 deletions(-) [+] |
line wrap: on
line diff
--- a/src/nsis-1-fixes.patch Wed Mar 30 08:06:29 2016 -0400 +++ b/src/nsis-1-fixes.patch Thu Mar 31 07:50:33 2016 -0400 @@ -3,16 +3,16 @@ Contains ad hoc patches for cross building. -From d143dbb2e06d8597dfea89d4b9f55f44ddc6e7f1 Mon Sep 17 00:00:00 2001 -From: MXE +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(""" @@ -26,7 +26,7 @@ # 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 = [ @@ -46,18 +46,15 @@ Export('defenv') --- -1.8.2.2 - -From 2c32b56851aa15ad8460ed3dd0944ecb78b43ea9 Mon Sep 17 00:00:00 2001 -From: MXE +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 @@ @@ -68,20 +65,17 @@ #endif --- -1.8.2.2 - -From ad29c1f6af0eba959e3bcb96992d1a709ba58aca Mon Sep 17 00:00:00 2001 -From: MXE +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 @@ -112,7 +106,7 @@ ### 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) { @@ -168,7 +162,7 @@ // 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; @@ -231,7 +225,7 @@ // 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 @@ @@ -255,7 +249,7 @@ 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; @@ -388,7 +382,7 @@ 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 @@ @@ -437,7 +431,7 @@ 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) @@ -450,7 +444,7 @@ 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) @@ -463,7 +457,7 @@ 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) @@ -476,7 +470,7 @@ 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) @@ -525,7 +519,7 @@ 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/ @@ -583,18 +577,15 @@ { SetLastError( 0 ); return dwResult; --- -1.8.2.2 - -From 055b07791400ae22bde948f60d71e3311e25f452 Mon Sep 17 00:00:00 2001 -From: MXE +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 @@ @@ -605,15 +596,6 @@ #include <nsis/pluginapi.h> // nsis plugin -@@ -149,7 +150,7 @@ struct FieldType { - int nField; // field number in INI file - char *pszHwndEntry; // "HWND" or "HWND2" - -- long wndProc; -+ long wndProc; - }; - - // initial buffer size. buffers will grow as required. @@ -759,7 +760,7 @@ BOOL CALLBACK cfgDlgProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) DrawText(lpdis->hDC, pField->pszText, -1, &rc, DT_VCENTER | DT_WORDBREAK | DT_CALCRECT); @@ -623,26 +605,8 @@ // Move rect to right if in RTL mode if (bRTL) -@@ -877,7 +878,7 @@ int WINAPI NumbersOnlyPasteWndProc(HWND hWin, UINT uMsg, WPARAM wParam, LPARAM l - if (OpenClipboard(hWin)) - { - HGLOBAL hData = GetClipboardData(CF_TEXT); -- -+ - if (hData) - { - char *lpData = (char *) GlobalLock(hData); -@@ -1346,7 +1347,7 @@ int WINAPI createCfgDlg() - - int keycolor = *bmp & 0xFFFFFF; - -- // Search for transparent pixels -+ // Search for transparent pixels - for (y = bm.bmHeight - 1; y >= 0; y--) { - 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 @@ @@ -652,7 +616,7 @@ #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 @@ @@ -665,7 +629,7 @@ #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) @@ -678,7 +642,7 @@ ##### 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') @@ -690,89 +654,3 @@ ### Some other settings -diff --git a/Source/util.cpp b/Source/util.cpp -index 18c31a2..fc9443f 100755 ---- a/Source/util.cpp -+++ b/Source/util.cpp -@@ -1,15 +1,15 @@ - /* - * util.cpp -- * -+ * - * This file is a part of NSIS. -- * -+ * - * Copyright (C) 1999-2009 Nullsoft and Contributors -- * -+ * - * Licensed under the zlib/libpng license (the "License"); - * you may not use this file except in compliance with the License. -- * -+ * - * Licence details can be found in the file COPYING. -- * -+ * - * This software is provided 'as-is', without any express or implied - * warranty. - */ -@@ -616,7 +616,7 @@ typedef struct _VXD_VERSION_RESOURCE { - } VXD_VERSION_RESOURCE, *PVXD_VERSION_RESOURCE; - #pragma pack( pop, pre_vxd_ver ) - --static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) -+static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) - { - - HANDLE hFile = NULL; -@@ -673,7 +673,7 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) - pDosExeHdr = (PIMAGE_DOS_HEADER) pView; - - // Check to make sure the file has a DOS EXE header. -- if ( pDosExeHdr->e_magic != IMAGE_DOS_SIGNATURE ) -+ if ( pDosExeHdr->e_magic != IMAGE_DOS_SIGNATURE ) - { - if ( pView ) - UnmapViewOfFile( pView ); -@@ -693,7 +693,7 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) - + pDosExeHdr->e_lfanew ); - - // Check to make sure the file is a VxD. -- if ( (DWORD) pNtExeHdr->Signature != IMAGE_VXD_SIGNATURE ) -+ if ( (DWORD) pNtExeHdr->Signature != IMAGE_VXD_SIGNATURE ) - { - if ( pView ) - UnmapViewOfFile( pView ); -@@ -769,18 +769,18 @@ static BOOL GetVxdVersion( LPCSTR szFile, LPDWORD lpdwLen, LPVOID lpData ) - return TRUE; - } - --static DWORD GetVxdVersionInfoSize( LPCSTR szFile ) -+static DWORD GetVxdVersionInfoSize( LPCSTR szFile ) - { - DWORD dwResult = 0; - - // Call GetVxdVersion() with NULL for the pointer to the buffer. -- if ( !GetVxdVersion( szFile, &dwResult, NULL ) ) -+ if ( !GetVxdVersion( szFile, &dwResult, NULL ) ) - { - DWORD dwError = GetLastError(); - - // GetVxdVersion() will fail with ERROR_INSUFFICIENT_BUFFER and - // the required buffer size will be returned in dwResult. -- if ( dwError == ERROR_INSUFFICIENT_BUFFER ) -+ if ( dwError == ERROR_INSUFFICIENT_BUFFER ) - { - SetLastError( 0 ); - return dwResult; -@@ -791,7 +791,7 @@ static DWORD GetVxdVersionInfoSize( LPCSTR szFile ) - return 0; - } - --static BOOL GetVxdVersionInfo( LPCSTR szFile, DWORD dwLen, LPVOID lpData ) -+static BOOL GetVxdVersionInfo( LPCSTR szFile, DWORD dwLen, LPVOID lpData ) - { - return GetVxdVersion( szFile, &dwLen, lpData ); - } --- -1.8.2.2 -
--- a/src/nsis.mk Wed Mar 30 08:06:29 2016 -0400 +++ b/src/nsis.mk Thu Mar 31 07:50:33 2016 -0400 @@ -3,8 +3,8 @@ PKG := nsis $(PKG)_IGNORE := -$(PKG)_VERSION := 2.46 -$(PKG)_CHECKSUM := 2cc9bff130031a0b1d76b01ec0a9136cdf5992ce +$(PKG)_VERSION := 2.50 +$(PKG)_CHECKSUM := 3748b81b83fb3d717da0db4178c228ac6e2a0543 $(PKG)_SUBDIR := nsis-$($(PKG)_VERSION)-src $(PKG)_FILE := nsis-$($(PKG)_VERSION)-src.tar.bz2 $(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/nsis/NSIS 2/$($(PKG)_VERSION)/$($(PKG)_FILE)