diff options
| -rw-r--r-- | dev-util/nsis/ChangeLog | 10 | ||||
| -rw-r--r-- | dev-util/nsis/files/nsis-2.46-gcc47.patch | 15 | ||||
| -rw-r--r-- | dev-util/nsis/nsis-2.46.ebuild | 7 |
3 files changed, 27 insertions, 5 deletions
diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog index f20ef7101141..8d3e62139a5a 100644 --- a/dev-util/nsis/ChangeLog +++ b/dev-util/nsis/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/nsis -# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.38 2012/12/16 16:35:10 ulm Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.39 2013/03/03 12:10:25 xarthisius Exp $ + + 03 Mar 2013; Kacper Kowalik <xarthisius@gentoo.org> + +files/nsis-2.46-gcc47.patch, nsis-2.46.ebuild: + Fix building with gcc-4.7 wrt #421871 by Danny Robson <danny@nerdcruft.net>. + Thanks to Rion <rion4ik@gmail.com> for suggestion regarding fix 16 Dec 2012; Ulrich Müller <ulm@gentoo.org> nsis-2.46.ebuild: Fix LICENSE, see COPYING file, bug 445656. @@ -165,4 +170,3 @@ +files/nsis-2.21-config.patch, +metadata.xml, +nsis-2.21.ebuild: Initial import from Sunrise, thanks to Cédric Krier <cedk@gentoo.org> (#136035). - diff --git a/dev-util/nsis/files/nsis-2.46-gcc47.patch b/dev-util/nsis/files/nsis-2.46-gcc47.patch new file mode 100644 index 000000000000..e64a8b6ba43f --- /dev/null +++ b/dev-util/nsis/files/nsis-2.46-gcc47.patch @@ -0,0 +1,15 @@ +Fix building with gcc-4.7 + +https://bugs.gentoo.org/show_bug.cgi?id=421871 + +Patch written by Kacper Kowalik <xarthisius@gentoo.org> +--- a/Source/util.h ++++ b/Source/util.h +@@ -18,6 +18,7 @@ + #define _UTIL_H_ + + #include <string> // for std::string ++#include <unistd.h> + + #include "boost/scoped_ptr.hpp" // for boost::scoped_ptr + #include "ResourceEditor.h" diff --git a/dev-util/nsis/nsis-2.46.ebuild b/dev-util/nsis/nsis-2.46.ebuild index aa3fae85b7de..29bb061af6c7 100644 --- a/dev-util/nsis/nsis-2.46.ebuild +++ b/dev-util/nsis/nsis-2.46.ebuild @@ -1,10 +1,12 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46.ebuild,v 1.3 2012/12/16 16:35:10 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46.ebuild,v 1.4 2013/03/03 12:10:25 xarthisius Exp $ EAPI="2" mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-}}mingw32) +inherit eutils + DESCRIPTION="Nullsoft Scriptable Install System" HOMEPAGE="http://nsis.sourceforge.net/" SRC_URI="mirror://sourceforge/${PN}/${P}-src.tar.bz2" @@ -46,6 +48,7 @@ pkg_setup() { } src_prepare() { + epatch "${FILESDIR}"/${P}-gcc47.patch # a dirty but effective way of killing generated docs use doc || echo > Docs/src/SConscript } |