diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-06-11 14:45:56 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-06-11 14:45:56 +0000 |
| commit | 9840dbe7b21a4475b629385bd3f0999f7aef717f (patch) | |
| tree | d46f93ab61aba543b88cbabd3767249e251c3ef8 /www-client | |
| parent | Version bump, remove old. (diff) | |
| download | gentoo-2-9840dbe7b21a4475b629385bd3f0999f7aef717f.tar.gz gentoo-2-9840dbe7b21a4475b629385bd3f0999f7aef717f.tar.bz2 gentoo-2-9840dbe7b21a4475b629385bd3f0999f7aef717f.zip | |
Fix building with libpng14 wrt #323513 by Stephen Lewis. Enjoy your remotely exploitable browser with state of the art png...
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/seamonkey/ChangeLog | 6 | ||||
| -rw-r--r-- | www-client/seamonkey/files/seamonkey-1.1.18-libpng14.patch | 18 | ||||
| -rw-r--r-- | www-client/seamonkey/seamonkey-1.1.18.ebuild | 8 |
3 files changed, 28 insertions, 4 deletions
diff --git a/www-client/seamonkey/ChangeLog b/www-client/seamonkey/ChangeLog index 12568588918f..8a7373177d3a 100644 --- a/www-client/seamonkey/ChangeLog +++ b/www-client/seamonkey/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-client/seamonkey # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.217 2010/04/09 03:56:59 polynomial-c Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/ChangeLog,v 1.218 2010/06/11 14:45:56 ssuominen Exp $ + + 11 Jun 2010; Samuli Suominen <ssuominen@gentoo.org> + seamonkey-1.1.18.ebuild, +files/seamonkey-1.1.18-libpng14.patch: + Fix building with libpng14 wrt #323513 by Stephen Lewis. *seamonkey-2.0.4-r1 (09 Apr 2010) diff --git a/www-client/seamonkey/files/seamonkey-1.1.18-libpng14.patch b/www-client/seamonkey/files/seamonkey-1.1.18-libpng14.patch new file mode 100644 index 000000000000..ec388b35b9ff --- /dev/null +++ b/www-client/seamonkey/files/seamonkey-1.1.18-libpng14.patch @@ -0,0 +1,18 @@ +http://bugs.gentoo.org/323513 + +--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp ++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp +@@ -111,9 +111,9 @@ + + // initialize + png_struct* png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING, +- png_voidp_NULL, +- png_error_ptr_NULL, +- png_error_ptr_NULL); ++ NULL, ++ NULL, ++ NULL); + if (! png_ptr) + return NS_ERROR_OUT_OF_MEMORY; + png_info* info_ptr = png_create_info_struct(png_ptr); + diff --git a/www-client/seamonkey/seamonkey-1.1.18.ebuild b/www-client/seamonkey/seamonkey-1.1.18.ebuild index ef12c6543649..c83a22229348 100644 --- a/www-client/seamonkey/seamonkey-1.1.18.ebuild +++ b/www-client/seamonkey/seamonkey-1.1.18.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.18.ebuild,v 1.8 2009/10/03 16:11:25 josejx Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/seamonkey/seamonkey-1.1.18.ebuild,v 1.9 2010/06/11 14:45:56 ssuominen Exp $ WANT_AUTOCONF="2.1" @@ -65,9 +65,11 @@ src_unpack() { EPATCH_FORCE="yes" \ epatch "${WORKDIR}"/patch - # Fix crash without -fno-strict-aliasing, bug 265642 + # Fix crash without -fno-strict-aliasing, bug 265642 epatch "${FILESDIR}/${PN}-1.1.17-fix-fno-strict-aliasing.patch" + epatch "${FILESDIR}"/${P}-libpng14.patch + # Unpack the enigmail plugin if use crypt && ! use moznomail; then cd "${S}"/mailnews/extensions || die |