Your message dated Tue, 14 Jun 2011 21:04:33 +0000
with message-id <[email protected]>
and subject line Bug#620099: fixed in nsis 2.46-4
has caused the Debian Bug report #620099,
regarding nsis: support building with mingw-w64
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
620099: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=620099
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: nsis
Version: 2.46-3
Severity: normal
Tags: patch
Hi,
In preparation for the forthcoming upload of mingw-w64, I've prepared
a patch allowing nsis to build with it. Notably the old
i586-mingw32msvc target is gone, replaced with the official
i686-w64-mingw32 triplet (even for Win32 builds).
You may ignore this bug until #594371 is closed (I'll tag this bug
appropriately).
Regards,
Stephen
diff -Nru nsis-2.46/debian/changelog nsis-2.46/debian/changelog
--- nsis-2.46/debian/changelog 2010-09-21 03:45:53.000000000 +0200
+++ nsis-2.46/debian/changelog 2011-03-30 02:20:09.000000000 +0200
@@ -1,3 +1,10 @@
+nsis (2.46-3.1) experimental; urgency=low
+
+ * Non-maintainer upload.
+ * Build with mingw-w64.
+
+ -- Stephen Kitt <[email protected]> Wed, 30 Mar 2011 02:20:09 +0200
+
nsis (2.46-3) experimental; urgency=low
* Removed architecture restrictions
diff -Nru nsis-2.46/debian/control nsis-2.46/debian/control
--- nsis-2.46/debian/control 2010-09-21 03:45:53.000000000 +0200
+++ nsis-2.46/debian/control 2011-03-30 02:19:52.000000000 +0200
@@ -2,7 +2,7 @@
Section: devel
Priority: optional
Maintainer: Thomas Gaugler <[email protected]>
-Build-Depends: debhelper (>= 7.0.50~), scons (>= 1.2.0), gcc-mingw32 (>= 4.4.0-3) | mingw32, mingw32-runtime, mingw32-binutils, xmlto, html2text, libcppunit-dev, zlib1g-dev
+Build-Depends: debhelper (>= 7.0.50~), scons (>= 1.2.0), mingw-w64 (>= 1.0), xmlto, html2text, libcppunit-dev, zlib1g-dev
Standards-Version: 3.9.1
Homepage: http://nsis.sourceforge.net/
Vcs-Svn: svn://svn.debian.org/collab-maint/ext-maint/nsis/trunk
@@ -11,7 +11,7 @@
Package: nsis
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: wine, gcc-mingw32
+Suggests: wine, mingw-w64
Description: Nullsoft Scriptable Install System (modified for Debian)
NSIS is a tool for creating quick and user friendly installers for
Microsoft Windows (Win32) operating systems.
diff -Nru nsis-2.46/debian/patches/mingw-w64.patch nsis-2.46/debian/patches/mingw-w64.patch
--- nsis-2.46/debian/patches/mingw-w64.patch 1970-01-01 01:00:00.000000000 +0100
+++ nsis-2.46/debian/patches/mingw-w64.patch 2011-03-30 02:20:16.000000000 +0200
@@ -0,0 +1,33 @@
+--- nsis-2.46.orig/Contrib/InstallOptions/InstallerOptions.cpp
++++ nsis-2.46/Contrib/InstallOptions/InstallerOptions.cpp
+@@ -14,6 +14,8 @@
+ #include "resource.h"
+ #include "shellapi.h"
+
++#include <algorithm>
++
+ #include <nsis/pluginapi.h> // nsis plugin
+
+ // Use for functions only called from one place to possibly reduce some code
+@@ -759,7 +761,7 @@
+ DrawText(lpdis->hDC, pField->pszText, -1, &rc, DT_VCENTER | DT_WORDBREAK | DT_CALCRECT);
+
+ // Make some more room so the focus rect won't cut letters off
+- rc.right = min(rc.right + 2, lpdis->rcItem.right);
++ rc.right = std::min(rc.right + 2, lpdis->rcItem.right);
+
+ // Move rect to right if in RTL mode
+ if (bRTL)
+--- nsis-2.46.orig/SCons/Tools/crossmingw.py
++++ nsis-2.46/SCons/Tools/crossmingw.py
+@@ -58,6 +58,10 @@
+ i486-pc-mingw32-
+ i586-pc-mingw32-
+ i686-pc-mingw32-
++ i386-w64-mingw32-
++ i486-w64-mingw32-
++ i586-w64-mingw32-
++ i686-w64-mingw32-
+ """)
+
+ def find(env):
diff -Nru nsis-2.46/debian/patches/series nsis-2.46/debian/patches/series
--- nsis-2.46/debian/patches/series 2010-05-06 04:15:31.000000000 +0200
+++ nsis-2.46/debian/patches/series 2011-03-30 02:16:07.000000000 +0200
@@ -1,3 +1,4 @@
# list of patch file names in the order they are applied
nsis_system_zlib.patch
makensis_native_64bit.patch
+mingw-w64.patch
diff -Nru nsis-2.46/debian/README.Debian nsis-2.46/debian/README.Debian
--- nsis-2.46/debian/README.Debian 2009-07-24 12:31:20.000000000 +0200
+++ nsis-2.46/debian/README.Debian 2011-03-30 02:18:15.000000000 +0200
@@ -9,12 +9,12 @@
The mingw32 include dir should be in the include path and it
usually is there by default, if not, add this to CPPFLAGS:
- -I /usr/i586-mingw32msvc/include
+ -I /usr/i686-w64-mingw32/include
The nsis subdir of the mingw32 library dir should be in the
linker path, you'll need the following in LDFLAGS:
- -L /usr/i586-mingw32msvc/lib/nsis
+ -L /usr/i686-w64-mingw32/lib/nsis
The nsis pluginapi static library needs to be linked against,
you'll need the following in LDFLAGS:
diff -Nru nsis-2.46/debian/rules nsis-2.46/debian/rules
--- nsis-2.46/debian/rules 2010-05-06 04:15:32.000000000 +0200
+++ nsis-2.46/debian/rules 2011-03-30 02:19:20.000000000 +0200
@@ -4,7 +4,7 @@
#export DH_VERBOSE=1
VERSION=${shell dpkg-parsechangelog | sed -n 's/^Version: *//p'}
-MINGW32_PATH=/usr/i586-mingw32msvc
+MINGW32_PATH=/usr/i686-w64-mingw32
SCONSOPTS = VERSION=$(VERSION) \
PREFIX=/usr PREFIX_CONF=/etc \
--- End Message ---
--- Begin Message ---
Source: nsis
Source-Version: 2.46-4
We believe that the bug you reported is fixed in the latest version of
nsis, which is due to be installed in the Debian FTP archive:
nsis-common_2.46-4_all.deb
to main/n/nsis/nsis-common_2.46-4_all.deb
nsis-doc_2.46-4_all.deb
to main/n/nsis/nsis-doc_2.46-4_all.deb
nsis-pluginapi_2.46-4_all.deb
to main/n/nsis/nsis-pluginapi_2.46-4_all.deb
nsis_2.46-4.debian.tar.gz
to main/n/nsis/nsis_2.46-4.debian.tar.gz
nsis_2.46-4.dsc
to main/n/nsis/nsis_2.46-4.dsc
nsis_2.46-4_amd64.deb
to main/n/nsis/nsis_2.46-4_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [email protected],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Thomas Gaugler <[email protected]> (supplier of updated nsis package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [email protected])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.8
Date: Sat, 11 Jun 2011 15:24:40 +0000
Source: nsis
Binary: nsis nsis-common nsis-pluginapi nsis-doc
Architecture: source all amd64
Version: 2.46-4
Distribution: unstable
Urgency: low
Maintainer: Thomas Gaugler <[email protected]>
Changed-By: Thomas Gaugler <[email protected]>
Description:
nsis - Nullsoft Scriptable Install System (modified for Debian)
nsis-common - Nullsoft Scriptable Install System stubs and plugins
nsis-doc - Nullsoft Scriptable Install System documentation
nsis-pluginapi - Nullsoft Scriptable Install System plugin API
Closes: 620099
Changes:
nsis (2.46-4) unstable; urgency=low
.
[ Thomas Gaugler ]
* Run architecture independent build process only when demanded.
* Split NSIS package into four packages:
- compiler and utilities (architecture dependent)
- plugins, stubs and resource files (win32)
- header and library files for developing NSIS plugins (win32)
- examples and HTML documentation (architecture independent)
* Updated to Standards-Version 3.9.2
* Support building with mingw-w64 (Closes: #620099)
* Support parallel build
.
[ Didier Raboud ]
* Don't hide output from scons in clean.
* Move packaging from Subversion to Git, update Vcs-* fields.
* Add explicit libstdc++6-4.6-dev Build-Depend.
Checksums-Sha1:
7b42d83759e2f3be408f073b91bc7768b25852eb 1407 nsis_2.46-4.dsc
d5e6a7086a7ccb3c1db5a80b753c5f3e06228f4a 39014 nsis_2.46-4.debian.tar.gz
c78b7ecc5f5215c6a43b357473909ae7d43aaeae 1048864 nsis-common_2.46-4_all.deb
96b6074709c5ddf97ffa41009e43298192d82c7c 219044 nsis-pluginapi_2.46-4_all.deb
fc6f6e903a283c2ac469f285bc4ce5de5e72609f 612126 nsis-doc_2.46-4_all.deb
665ff0edbb98cd639d33d21255a6b0e6f6078be4 476358 nsis_2.46-4_amd64.deb
Checksums-Sha256:
593ba93a70ea71e1b4e9a417b4beccbaaf283c3fd7e54f9fccf8e9c2c8777abf 1407
nsis_2.46-4.dsc
49dd45bbf37c53f0d271238d48a75185b3b129713bba97e2f041b53493fb68ca 39014
nsis_2.46-4.debian.tar.gz
07a2ae41d605f987632709862f6cbfbec856601cf8de68adcc59879196e0967b 1048864
nsis-common_2.46-4_all.deb
d85f63da9b4684d9c2b1c0b9e1a3619a870b7a1458ce61deae8547ee92b0bbbb 219044
nsis-pluginapi_2.46-4_all.deb
6e495133149d94527b6927e01d3da70bd0b9f9cb5ec01836b8df5f5096697072 612126
nsis-doc_2.46-4_all.deb
b5964490f4bec465ccb71e9c9a15ec13a775f3104051dab5c21f53ca60b13b0d 476358
nsis_2.46-4_amd64.deb
Files:
9429f2fd4308b465ec11611b644954de 1407 devel optional nsis_2.46-4.dsc
9154e2a8798a87947b1ea9d7a1808689 39014 devel optional nsis_2.46-4.debian.tar.gz
1e523802a656e665b3e3880ca9410b73 1048864 devel optional
nsis-common_2.46-4_all.deb
205353b2a28a8fec9d695c7fc459d52f 219044 devel optional
nsis-pluginapi_2.46-4_all.deb
320674dec7e71a4ee8f399d12de2c2e3 612126 doc optional nsis-doc_2.46-4_all.deb
07ad461bb53aa6ac5d8d5f2e7970895b 476358 devel optional nsis_2.46-4_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iJwEAQECAAYFAk30nQcACgkQKA1Vt+jBwDhSDwQAi/z2Q5e6G0IHteYzYk4TehZZ
Deh8IxoTWCDw46pog4QlsZS1V+QJjkQUKh2KXqTFzRrDONgCFrP5XW5aEB1HFFWA
WXVHQIaKwyR+VrRQP6lj+vDTGhB5wI8TZcPp8YpX2pBvIaQEvTDQqUbhMNWGUgdP
IDo8Z6KMBa4Vmt7sr+Y=
=TvYU
-----END PGP SIGNATURE-----
--- End Message ---
