Fix building with libpng14 wrt #319093 by Jonathan Adamczewski.

Package-Manager: portage-2.2_rc67/cvs/Linux x86_64

4 files changed, 27 insertions, 14 deletions

diff --git a/app-office/mozilla-sunbird/ChangeLog b/app-office/mozilla-sunbird/ChangeLog
index 1d4e13be1318..7b72c7d2d232 100644
--- a/app-office/mozilla-sunbird/ChangeLog
+++ b/app-office/mozilla-sunbird/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/mozilla-sunbird
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.44 2010/02/22 16:03:00 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/ChangeLog,v 1.45 2010/05/10 13:57:27 ssuominen Exp $
+
+  10 May 2010; Samuli Suominen <ssuominen@gentoo.org> +files/lpng14.patch,
+  mozilla-sunbird-0.9.ebuild:
+  Fix building with libpng14 wrt #319093 by Jonathan Adamczewski.
 
   22 Feb 2010; Christian Faulhammer <fauli@gentoo.org>
   mozilla-sunbird-0.9.ebuild:
diff --git a/app-office/mozilla-sunbird/Manifest b/app-office/mozilla-sunbird/Manifest
index 652fd188087c..d8c85658d069 100644
--- a/app-office/mozilla-sunbird/Manifest
+++ b/app-office/mozilla-sunbird/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX icon/mozilla-sunbird-icon.png 6418 RMD160 92df6105a3ba07f961d5a54000e772791f1d89ac SHA1 e4e23c74234d688040f6cdaff4ace7f71d69dce4 SHA256 792fa9c96e825a0ba5d9f837910386dcb819e215fcc18c00936718823dee076e
 AUX icon/mozilla-sunbird-unbranded-icon.png 4862 RMD160 31c18ecb694c24476ea4b025554394c9161ca4a1 SHA1 c9e0f3d85934a18319ea16220940d0a6e8eed1c3 SHA256 1a732f3ccbbcd7288a2bca566e94af7dee554d419a7e8855a9d20b22b19f3a4e
 AUX icon/mozilla-sunbird-unbranded.desktop 188 RMD160 8338a27dc0f7a9b618b4b0994ce19ba1dd739c6e SHA1 dd77543a71ab37daa5ea1dbdb02a3a43de016766 SHA256 b2379ebdff6012c8e1f85891351a985fbe750787861058bdb7b08b44d1be53d8
 AUX icon/mozilla-sunbird.desktop 178 RMD160 2f032684c794bbf6659ce631843661eeacf02acb SHA1 c481835c1905e35cee98bbb1b6029bf7a2f62d23 SHA256 f3ddcac36c7c6f10a4180c6ff77b377743841cb76eaf409b40e0568eede16469
+AUX lpng14.patch 646 RMD160 117fc3060cdbc2f77d030d8d4d7baff91d7400b8 SHA1 9d8e832a9016f9a5ca901101702104227264087c SHA256 c9c17e1b9a854035c13d6e9dc6b2993ec4387b3c00f0004bb7d921c773d1b7ec
 DIST lightning-sunbird-0.9-source.tar.bz2 43121977 RMD160 d127fd16a59b945b10b125edf27a310c52a2725f SHA1 e85bbc08515cc64258fbba837b89f6ba55005480 SHA256 329b256bd463a76527c255cd5b8141ffb6df077ce8d63efdffad6516f0b90f64
 DIST mozilla-sunbird-0.9-ca.xpi 101753 RMD160 977876ffa583d12e4063538781cb4a2633626bb3 SHA1 72cfb24d43810b7557ca2892289ea403c8fab640 SHA256 e231873772dbdb5db2825521750b4d62e459ed1b2f5cd139a4137ecc0c1e46ba
 DIST mozilla-sunbird-0.9-cs.xpi 101470 RMD160 b7d0718965eafa9d1d52207e4c1300955255053a SHA1 bd38306f12912bbd18546398891adb2c88af9f27 SHA256 6aaa4df616822e81a9593f638f977d4589aa9d0496742ea6ae2b6492c73e9bd9
@@ -36,13 +34,6 @@ DIST mozilla-sunbird-0.9-sl.xpi 101323 RMD160 c48de8c4e611c4a966bba5884ad12e1f73
 DIST mozilla-sunbird-0.9-sv-SE.xpi 103397 RMD160 b47071209153e83b93e27b4f2d686af846ae0600 SHA1 19aae9ac7691c3d5a335d82395f4e9b28406d7f1 SHA256 13533b9dac892be82d6f79522a8e48b715a90ab9f9f8e68151cb4e8586f2954e
 DIST mozilla-sunbird-0.9-uk.xpi 99857 RMD160 af7c38ecda534e28f5f037654b21690e6c779ed1 SHA1 686b06b91b67ca88eeff5f672ae765176ccf7440 SHA256 eb63f07fcc76fbab422a4d9e9cb1215a9164f661660d06fe7a268a49f6c8d399
 DIST mozilla-sunbird-0.9-zh-CN.xpi 86524 RMD160 ee349c90e1fcece41d08329e8f9c34ec6f4e7d26 SHA1 065f63789a1e6760d756557cf6852702367577e3 SHA256 7dae4f23adb5794ea0344bee4710e9f875fbe3f69bd69e722455498fcdcdade4
-EBUILD mozilla-sunbird-0.9.ebuild 7296 RMD160 7f2169fd09f602cfbfa1948e1f8a46b50f6e216b SHA1 4fb0efd550d59f8fd667446347cef499000a586d SHA256 c770e5118c3422efe8e98d0ece2f301d233b1b5cc768c761e1864f67adc97c1d
-MISC ChangeLog 6164 RMD160 899fede7bb83784e794d6d3db6aeb4bd450cd1be SHA1 cf4dcde0bb65e96671a22b55e4a1f5004417972a SHA256 eae931ea405a8dc4bfad1c242e46f93d6c6d9e9373d1abbb80436a25c28f5006
+EBUILD mozilla-sunbird-0.9.ebuild 7362 RMD160 fdd5f68a8f6cf9180231f9d08dd1ed8e3cae48cb SHA1 efde0e9340dcbd7353b7102500b8c39c77dec426 SHA256 6dfcec7dcdfe773fd4f49e3c6e1c1c65cd2b7d51c4b87ca0d93f6fb4fb37cc39
+MISC ChangeLog 6340 RMD160 6caec0a329a15491dea9f2465bd0f47586f8184c SHA1 c52fd6c6566c871afcc7f73bfabf93a9604916f6 SHA256 58ba65474f91e1066d3ea550b496f0d53d2b9b9e468589fa5f7873393cfa9da1
 MISC metadata.xml 235 RMD160 5ec9b7e23772bcc5b0fef18c146e9dee3e2e86c5 SHA1 c00adcc355b847474b46426d0e2783912d118dfe SHA256 66299d85e5b44ccfbacf41d30c2934f0e056ff3771ac6df8d0115815247971e2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.14 (GNU/Linux)
-
-iEYEARECAAYFAkuCqroACgkQNQqtfCuFneM87QCglsDNnOYLepj+jItFPKKWl2w4
-Nf8AmgO5Z53u26H4n1s//L1SGfUNXR7M
-=hKEJ
------END PGP SIGNATURE-----
diff --git a/app-office/mozilla-sunbird/files/lpng14.patch b/app-office/mozilla-sunbird/files/lpng14.patch
new file mode 100644
index 000000000000..7bbdc342505c
--- /dev/null
+++ b/app-office/mozilla-sunbird/files/lpng14.patch
@@ -0,0 +1,15 @@
+Bug 319093 by Jonathan Adamczewski
+
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp
+@@ -111,9 +111,7 @@
+ 
+   // 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/app-office/mozilla-sunbird/mozilla-sunbird-0.9.ebuild b/app-office/mozilla-sunbird/mozilla-sunbird-0.9.ebuild
index d08c031e8cf5..c92818d2eb9c 100644
--- a/app-office/mozilla-sunbird/mozilla-sunbird-0.9.ebuild
+++ b/app-office/mozilla-sunbird/mozilla-sunbird-0.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.9.ebuild,v 1.8 2010/02/22 16:03:00 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/mozilla-sunbird/mozilla-sunbird-0.9.ebuild,v 1.9 2010/05/10 13:57:27 ssuominen Exp $
 
 WANT_AUTOCONF="2.1"
 
@@ -116,6 +116,9 @@ src_unpack() {
 	EPATCH_FORCE="yes" \
 	epatch "${WORKDIR}"/patch
 
+	# todo: move to patchset
+	epatch "${FILESDIR}"/lpng14.patch
+
 	eautoreconf
 }