diff options
author | Pacho Ramos <pacho@gentoo.org> | 2014-09-26 12:54:56 +0000 |
---|---|---|
committer | Pacho Ramos <pacho@gentoo.org> | 2014-09-26 12:54:56 +0000 |
commit | 69236e73d51989cb7c4deec9c322baaebcd6ceb3 (patch) | |
tree | a560a20fe71ba6cb381eb132b434f7be256ac703 /dev-util/nsis | |
parent | Stable on alpha, bug 523044 (diff) | |
download | gentoo-2-69236e73d51989cb7c4deec9c322baaebcd6ceb3.tar.gz gentoo-2-69236e73d51989cb7c4deec9c322baaebcd6ceb3.tar.bz2 gentoo-2-69236e73d51989cb7c4deec9c322baaebcd6ceb3.zip |
Fix building (#505996 by Luke-Jr)
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)
Diffstat (limited to 'dev-util/nsis')
-rw-r--r-- | dev-util/nsis/ChangeLog | 5 | ||||
-rw-r--r-- | dev-util/nsis/nsis-2.46-r1.ebuild | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/dev-util/nsis/ChangeLog b/dev-util/nsis/ChangeLog index 53aef2ace46a..e663114abbfc 100644 --- a/dev-util/nsis/ChangeLog +++ b/dev-util/nsis/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/nsis # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.45 2014/03/22 19:03:27 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/ChangeLog,v 1.46 2014/09/26 12:54:56 pacho Exp $ + + 26 Sep 2014; Pacho Ramos <pacho@gentoo.org> nsis-2.46-r1.ebuild: + Fix building (#505996 by Luke-Jr) 22 Mar 2014; Michael Palimaka <kensington@gentoo.org> -nsis-2.46.ebuild: Remove old. diff --git a/dev-util/nsis/nsis-2.46-r1.ebuild b/dev-util/nsis/nsis-2.46-r1.ebuild index 0bd12408522a..0b41d4dc401c 100644 --- a/dev-util/nsis/nsis-2.46-r1.ebuild +++ b/dev-util/nsis/nsis-2.46-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46-r1.ebuild,v 1.4 2014/01/26 11:02:46 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/nsis/nsis-2.46-r1.ebuild,v 1.5 2014/09/26 12:54:56 pacho Exp $ EAPI="5" mingw32_variants=$(echo {,i{6,5,4,3}86-{,pc-,w32-,w64-}}mingw32) @@ -50,6 +50,8 @@ src_prepare() { epatch "${DISTDIR}/makensis_64bit.patch" epatch "${DISTDIR}/nsis_w64-mingw.patch" + sed -i 's/SetDefault/Append/' "${S}/Source/exehead/SConscript" || die #505996 + # a dirty but effective way of killing generated docs use doc || echo > Docs/src/SConscript } |