rpms/mingw32-nsis/EL-5 nsis-2.43-64bit-fixes.patch, NONE, 1.1 nsis-2.43-rpm-opt.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 mingw32-nsis.spec, 1.2, 1.3 sources, 1.2, 1.3 nsis-2.42-debian-64bit-fixes.patch, 1.1, NONE nsis-2.43-debian-debug-opt.patch, 1.1, NONE

Kevin Kofler kkofler at fedoraproject.org
Sun Jun 14 04:43:29 UTC 2009


Author: kkofler

Update of /cvs/pkgs/rpms/mingw32-nsis/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19369/EL-5

Modified Files:
	.cvsignore mingw32-nsis.spec sources 
Added Files:
	nsis-2.43-64bit-fixes.patch nsis-2.43-rpm-opt.patch 
Removed Files:
	nsis-2.42-debian-64bit-fixes.patch 
	nsis-2.43-debian-debug-opt.patch 
Log Message:
Sync my fixes from Fedora:

* Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.44-1
- Update to 2.44 (#488522)

* Tue Mar  3 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-6
- Don't build the MinGW parts with debugging information, NSIS corrupts the
  debugging information in the stubs when building installers from them
- Drop debian-debug-opt patch, all its changes are either taken care of by our
  rpm-opt patch, unwanted (see above) or unneeded

* Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-5
- Use RPM_OPT_FLAGS for the natively-built parts

* Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-4
- Updated 64bit-fixes patch (remove some more -m32 use)
- Drop ExclusiveArch, not needed with the above
- Obsoletes/Provides nsis and nsis-data for migration path from CalcForge
- Disable NSIS Menu (does not work on *nix, see specfile comment for details)
- Drop BR wxGTK-devel

RANT: Why do I have to do this? Whoever wanted that EPEL branch (not me!) should actually maintain it! Those fixes have been there for 3 months.

nsis-2.43-64bit-fixes.patch:

--- NEW FILE nsis-2.43-64bit-fixes.patch ---
diff -ur nsis-2.43-src/SCons/Config/gnu nsis-2.43-src-64bit-fixes/SCons/Config/gnu
--- nsis-2.43-src/SCons/Config/gnu	2009-02-05 01:52:28.000000000 +0100
+++ nsis-2.43-src-64bit-fixes/SCons/Config/gnu	2009-02-25 07:59:44.000000000 +0100
@@ -95,8 +95,6 @@
 makensis_env.Append(CXXFLAGS = ['-Wall'])                 # all warnings
 
 conf = FlagsConfigure(makensis_env)
-conf.CheckCompileFlag('-m32')                     #
-conf.CheckLinkFlag('-m32')                        #
 conf.CheckLinkFlag('$MAP_FLAG')                   # generate map file
 if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
 	TestStrip(conf)                                 # strip
@@ -149,8 +147,6 @@
 ### cross-platform util environment adjustments
 
 conf = FlagsConfigure(cp_util_env)
-conf.CheckCompileFlag('-m32')
-conf.CheckLinkFlag('-m32')
 if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
 	TestStrip(conf)                                 # strip
 conf.Finish()
@@ -160,8 +156,6 @@
 test_env = defenv.Clone()
 test_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
 conf = FlagsConfigure(test_env)
-conf.CheckCompileFlag('-m32')
-conf.CheckLinkFlag('-m32')
 conf.Finish()
 
 ### weird GCC requirements
diff -ur nsis-2.43-src/Source/DialogTemplate.cpp nsis-2.43-src-64bit-fixes/Source/DialogTemplate.cpp
--- nsis-2.43-src/Source/DialogTemplate.cpp	2007-11-30 10:54:13.000000000 +0100
+++ nsis-2.43-src-64bit-fixes/Source/DialogTemplate.cpp	2009-02-25 07:59:44.000000000 +0100
@@ -74,7 +74,7 @@
     if (IS_INTRESOURCE(x)) { \
       *(WORD*)seeker = 0xFFFF; \
       seeker += sizeof(WORD); \
-      *(WORD*)seeker = ConvertEndianness(WORD(DWORD(x))); \
+      *(WORD*)seeker = ConvertEndianness(WORD(long(x))); \
       seeker += sizeof(WORD); \
     } \
     else { \
@@ -622,7 +622,7 @@
     }
   }
 
-  assert((DWORD) seeker - (DWORD) pbDlg == dwSize);
+  assert((long) seeker - (long) pbDlg == dwSize);
 
   // DONE!
   return pbDlg;
diff -ur nsis-2.43-src/Source/mmap.cpp nsis-2.43-src-64bit-fixes/Source/mmap.cpp
--- nsis-2.43-src/Source/mmap.cpp	2009-02-01 15:44:30.000000000 +0100
+++ nsis-2.43-src-64bit-fixes/Source/mmap.cpp	2009-02-25 07:59:44.000000000 +0100
@@ -322,7 +322,7 @@
   if (!pView)
     return;
 
-  unsigned int alignment = ((unsigned int)pView) % m_iAllocationGranularity;
+  unsigned int alignment = ((unsigned long)pView) % m_iAllocationGranularity;
   pView = (char *)pView - alignment;
   size += alignment;
 #ifdef _WIN32
diff -ur nsis-2.43-src/Source/Platform.h nsis-2.43-src-64bit-fixes/Source/Platform.h
--- nsis-2.43-src/Source/Platform.h	2009-02-01 15:44:30.000000000 +0100
+++ nsis-2.43-src-64bit-fixes/Source/Platform.h	2009-02-25 07:59:44.000000000 +0100
@@ -166,7 +166,7 @@
 #    define MAKEINTRESOURCE MAKEINTRESOURCEA
 #  endif
 #  ifndef IMAGE_FIRST_SECTION
-#    define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (DWORD) h + \
+#    define IMAGE_FIRST_SECTION(h) ( PIMAGE_SECTION_HEADER( (long) h + \
                                      FIELD_OFFSET(IMAGE_NT_HEADERS, OptionalHeader) + \
                                      FIX_ENDIAN_INT16(PIMAGE_NT_HEADERS(h)->FileHeader.SizeOfOptionalHeader) ) )
 #  endif
@@ -198,7 +198,7 @@
 #endif
 
 #ifndef ULONG_PTR
-#  define ULONG_PTR DWORD
+#  define ULONG_PTR ULONG
 #endif
 
 #ifndef IDC_HAND
@@ -703,7 +703,7 @@
   WORD e_oemid;
   WORD e_oeminfo;
   WORD e_res2[10];
-  LONG e_lfanew;
+  DWORD e_lfanew;
 } IMAGE_DOS_HEADER,*PIMAGE_DOS_HEADER;
 #  pragma pack()
 #  pragma pack(4)
diff -ur nsis-2.43-src/Source/Plugins.cpp nsis-2.43-src-64bit-fixes/Source/Plugins.cpp
--- nsis-2.43-src/Source/Plugins.cpp	2009-02-01 15:44:30.000000000 +0100
+++ nsis-2.43-src-64bit-fixes/Source/Plugins.cpp	2009-02-25 07:59:44.000000000 +0100
@@ -136,7 +136,7 @@
         DWORD prd = FIX_ENDIAN_INT32(sections[i].PointerToRawData);
         PIMAGE_EXPORT_DIRECTORY exports = PIMAGE_EXPORT_DIRECTORY(&dlldata[0] + prd + ExportDirVA - va);
         DWORD na = FIX_ENDIAN_INT32(exports->AddressOfNames);
-        unsigned long *names = (unsigned long*)((unsigned long) exports + (char *) na - ExportDirVA);
+        unsigned int *names = (unsigned int*)((unsigned long) exports + (char *) na - ExportDirVA);
         for (unsigned long j = 0; j < FIX_ENDIAN_INT32(exports->NumberOfNames); j++)
         {
           const string name = string((char*)exports + FIX_ENDIAN_INT32(names[j]) - ExportDirVA);
diff -ur nsis-2.43-src/Source/ResourceEditor.cpp nsis-2.43-src-64bit-fixes/Source/ResourceEditor.cpp
--- nsis-2.43-src/Source/ResourceEditor.cpp	2009-02-05 01:50:12.000000000 +0100
+++ nsis-2.43-src-64bit-fixes/Source/ResourceEditor.cpp	2009-02-25 07:59:44.000000000 +0100
@@ -684,7 +684,7 @@
     rdDir.NumberOfIdEntries = ConvertEndianness(rdDir.NumberOfIdEntries);
 
     CopyMemory(seeker, &rdDir, sizeof(IMAGE_RESOURCE_DIRECTORY));
-    crd->m_dwWrittenAt = DWORD(seeker);
+    crd->m_dwWrittenAt = long(seeker);
     seeker += sizeof(IMAGE_RESOURCE_DIRECTORY);
 
     for (int i = 0; i < crd->CountEntries(); i++) {
@@ -705,7 +705,7 @@
       rDirE.UName.NameString.NameIsString = (crd->GetEntry(i)->HasName()) ? 1 : 0;
 
       CopyMemory(seeker, &rDirE, sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY));
-      crd->GetEntry(i)->m_dwWrittenAt = DWORD(seeker);
+      crd->GetEntry(i)->m_dwWrittenAt = long(seeker);
       seeker += sizeof(MY_IMAGE_RESOURCE_DIRECTORY_ENTRY);
     }
     qDirs.pop();
@@ -721,7 +721,7 @@
     rDataE.Size = ConvertEndianness(cRDataE->GetSize());
 
     CopyMemory(seeker, &rDataE, sizeof(IMAGE_RESOURCE_DATA_ENTRY));
-    cRDataE->m_dwWrittenAt = DWORD(seeker);
+    cRDataE->m_dwWrittenAt = long(seeker);
     seeker += sizeof(IMAGE_RESOURCE_DATA_ENTRY);
 
     qDataEntries.pop();
@@ -733,7 +733,7 @@
   while (!qStrings.empty()) {
     CResourceDirectoryEntry* cRDirE = qStrings.front();
 
-    PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(DWORD(seeker) - DWORD(pbRsrcSec));
+    PMY_IMAGE_RESOURCE_DIRECTORY_ENTRY(cRDirE->m_dwWrittenAt)->UName.NameString.NameOffset = ConvertEndianness(long(seeker) - long(pbRsrcSec));
 
     WCHAR* szName = cRDirE->GetName();
     WORD iLen = winchar_strlen(szName) + 1;
@@ -764,7 +764,7 @@
   /*
    * Set all of the directory entries offsets.
    */
-  SetOffsets(m_cResDir, DWORD(pbRsrcSec));
+  SetOffsets(m_cResDir, long(pbRsrcSec));
 }
 
 // Sets the offsets in directory entries
@@ -887,7 +887,7 @@
 // Returns -1 if can not be found
 int CResourceDirectory::Find(WCHAR* szName) {
   if (IS_INTRESOURCE(szName))
-    return Find((WORD) (DWORD) szName);
+    return Find((WORD) (long) szName);
   else
     if (szName[0] == '#')
       return Find(WORD(winchar_stoi(szName + 1)));
@@ -965,7 +965,7 @@
   if (IS_INTRESOURCE(szName)) {
     m_bHasName = false;
     m_szName = 0;
-    m_wId = (WORD) (DWORD) szName;
+    m_wId = (WORD) (long) szName;
   }
   else {
     m_bHasName = true;
@@ -979,7 +979,7 @@
   if (IS_INTRESOURCE(szName)) {
     m_bHasName = false;
     m_szName = 0;
-    m_wId = (WORD) (DWORD) szName;
+    m_wId = (WORD) (long) szName;
   }
   else {
     m_bHasName = true;
diff -ur nsis-2.43-src/Source/util.cpp nsis-2.43-src-64bit-fixes/Source/util.cpp
--- nsis-2.43-src/Source/util.cpp	2009-02-01 15:44:30.000000000 +0100
+++ nsis-2.43-src-64bit-fixes/Source/util.cpp	2009-02-25 07:59:44.000000000 +0100
@@ -77,9 +77,9 @@
   }
 
   if (width != 0) {
-    LONG biWidth;
+    DWORD biWidth;
     fseek(f, 18, SEEK_SET); // Seek to the width member of the header
-    fread(&biWidth, sizeof(LONG), 1, f);
+    fread(&biWidth, sizeof(DWORD), 1, f);
     FIX_ENDIAN_INT32_INPLACE(biWidth);
     if (width != biWidth) {
       fclose(f);
@@ -88,12 +88,12 @@
   }
 
   if (height != 0) {
-    LONG biHeight;
+    DWORD biHeight;
     fseek(f, 22, SEEK_SET); // Seek to the height member of the header
-    fread(&biHeight, sizeof(LONG), 1, f);
+    fread(&biHeight, sizeof(DWORD), 1, f);
     FIX_ENDIAN_INT32_INPLACE(biHeight);
     // Bitmap height can be negative too...
-    if (height != abs(biHeight)) {
+    if (height != abs((long int)biHeight)) {
       fclose(f);
       return -3;
     }

nsis-2.43-rpm-opt.patch:

--- NEW FILE nsis-2.43-rpm-opt.patch ---
diff -ur nsis-2.43-src-64bit-fixes/SCons/Config/gnu nsis-2.43-src-rpm-opt/SCons/Config/gnu
--- nsis-2.43-src-64bit-fixes/SCons/Config/gnu	2009-02-25 08:33:39.000000000 +0100
+++ nsis-2.43-src-rpm-opt/SCons/Config/gnu	2009-03-03 22:24:49.000000000 +0100
@@ -1,5 +1,7 @@
 print "Using GNU tools configuration"
 
+import os
+
 Import('defenv')
 
 ### imports
@@ -89,7 +91,7 @@
 makensis_env.Append(CPPPATH = ['#$BUILD_CONFIG'])
 
 if not defenv['DEBUG']:
-	makensis_env.Append(CCFLAGS = ['-O2'])                  # optimize
+	makensis_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS'))                  # optimize
 makensis_env.Append(CFLAGS = ['-Wall'])                   # all warnings
 makensis_env.Append(CXXFLAGS = ['-Wno-non-virtual-dtor']) # ignore virtual dtor warnings
 makensis_env.Append(CXXFLAGS = ['-Wall'])                 # all warnings
@@ -146,6 +148,7 @@
 
 ### cross-platform util environment adjustments
 
+cp_util_env.Append(CCFLAGS = os.getenv('RPM_OPT_FLAGS'))
 conf = FlagsConfigure(cp_util_env)
 if not defenv['DEBUG'] and defenv['STRIP'] and defenv['STRIP_CP']:
 	TestStrip(conf)                                 # strip


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsis/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore	21 Feb 2009 17:17:06 -0000	1.2
+++ .cvsignore	14 Jun 2009 04:42:57 -0000	1.3
@@ -1 +1 @@
-nsis-2.43-src.tar.bz2
+nsis-2.44-src.tar.bz2


Index: mingw32-nsis.spec
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsis/EL-5/mingw32-nsis.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- mingw32-nsis.spec	21 Feb 2009 17:31:47 -0000	1.2
+++ mingw32-nsis.spec	14 Jun 2009 04:42:57 -0000	1.3
@@ -1,9 +1,9 @@
-%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System DEBUG_SYMBOLS=1 OPTS=1
+%define sconsopts VERSION=%{version} PREFIX=%{_prefix} PREFIX_CONF=%{_sysconfdir} SKIPPLUGINS=System SKIPUTILS='NSIS Menu' STRIP_CP=false
 %define _default_patch_fuzz 2
 
 Name:           mingw32-nsis
-Version:        2.43
-Release:        3%{?dist}
+Version:        2.44
+Release:        1%{?dist}
 Summary:        Nullsoft Scriptable Install System
 
 License:        zlib and CPL
@@ -12,9 +12,11 @@ URL:            http://nsis.sourceforge.
 Source0:        http://dl.sourceforge.net/sourceforge/nsis/nsis-%{version}-src.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-# Patches from Debian (mainly by Paul Wise).
-Patch0:         nsis-2.42-debian-64bit-fixes.patch
-Patch1:         nsis-2.43-debian-debug-opt.patch
+# This patch fixes NSIS to actually build 64-bit versions.
+# Originally from Debian, updated by Kevin Kofler.
+Patch0:         nsis-2.43-64bit-fixes.patch
+# Use RPM_OPT_FLAGS for the natively-built parts
+Patch1:         nsis-2.43-rpm-opt.patch
 
 BuildRequires:  mingw32-filesystem >= 40
 BuildRequires:  mingw32-gcc
@@ -23,9 +25,24 @@ BuildRequires:  mingw32-binutils
 BuildRequires:  python
 BuildRequires:  scons
 
-# since nsis a 32 bit only apps
-ExclusiveArch:  %{ix86} ppc
-BuildRequires:  wxGTK-devel
+# Don't build NSIS Menu as it doesn't actually work on POSIX systems: 1. it
+# doesn't find its index.html file without patching, 2. it has various links to
+# .exe files such as the makensisw.exe W32 GUI which are not available in the
+# POSIX version at all and 3. the documentation links have backslashes in the
+# URLs and the relative paths are wrong. Almost none of the links worked when I
+# tested it (after patching problem 1.).
+# Also removes unnecessary wxGTK dependency for this otherwise GUI-less package.
+# (Does it really make sense to drag in wxGTK just to display a HTML file?)
+# If you really want to reenable this, it needs a lot of fixing. Oh, and it'd
+# need a .desktop file too.
+# -- Kevin Kofler
+# BuildRequires:  wxGTK-devel
+
+# upgrade path for CalcForge users
+Obsoletes:      nsis < %{version}-%{release}
+Provides:       nsis = %{version}-%{release}
+Obsoletes:      nsis-data < %{version}-%{release}
+Provides:       nsis-data = %{version}-%{release}
 
 
 %description
@@ -42,7 +59,7 @@ assembler code.
 %setup -q -n nsis-%{version}-src
 
 %patch0 -p1 -b .64bit
-%patch1 -p1 -b .debug
+%patch1 -p1 -b .rpmopt
 
 
 %build
@@ -72,6 +89,25 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Mar 14 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.44-1
+- Update to 2.44 (#488522)
+
+* Tue Mar  3 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-6
+- Don't build the MinGW parts with debugging information, NSIS corrupts the
+  debugging information in the stubs when building installers from them
+- Drop debian-debug-opt patch, all its changes are either taken care of by our
+  rpm-opt patch, unwanted (see above) or unneeded
+
+* Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-5
+- Use RPM_OPT_FLAGS for the natively-built parts
+
+* Wed Feb 25 2009 Kevin Kofler <Kevin at tigcc.ticalc.org> - 2.43-4
+- Updated 64bit-fixes patch (remove some more -m32 use)
+- Drop ExclusiveArch, not needed with the above
+- Obsoletes/Provides nsis and nsis-data for migration path from CalcForge
+- Disable NSIS Menu (does not work on *nix, see specfile comment for details)
+- Drop BR wxGTK-devel
+
 * Sat Feb 21 2009 Richard W.M. Jones <rjones at redhat.com> - 2.43-3
 - Restore ExclusiveArch line (Levente Farkas).
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/mingw32-nsis/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources	21 Feb 2009 17:17:07 -0000	1.2
+++ sources	14 Jun 2009 04:42:58 -0000	1.3
@@ -1 +1 @@
-a034a602c03ad7c5512423e9e961f372  nsis-2.43-src.tar.bz2
+b7f508d5e66ea6730f15702dd793237b  nsis-2.44-src.tar.bz2


--- nsis-2.42-debian-64bit-fixes.patch DELETED ---


--- nsis-2.43-debian-debug-opt.patch DELETED ---




More information about the fedora-extras-commits mailing list