Added fixed patch to build with libpng15 (bug #383567)

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64

3 files changed, 100 insertions, 18 deletions

diff --git a/app-office/abiword/ChangeLog b/app-office/abiword/ChangeLog
index 9c055418ea43..5254ce09c125 100644
--- a/app-office/abiword/ChangeLog
+++ b/app-office/abiword/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-office/abiword
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.246 2011/08/07 08:59:48 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/abiword/ChangeLog,v 1.247 2011/09/23 09:08:02 polynomial-c Exp $
+
+  23 Sep 2011; Lars Wendler <polynomial-c@gentoo.org>
+  files/abiword-2.8.6-libpng15.patch:
+  non-maintainer commit: Added fixed patch to build with libpng15 (bug
+  #383567).
 
   07 Aug 2011; Samuli Suominen <ssuominen@gentoo.org> abiword-2.8.6-r1.ebuild,
   +files/abiword-2.8.6-libpng15.patch:
diff --git a/app-office/abiword/Manifest b/app-office/abiword/Manifest
index bce3782ff1c1..c3459183cc09 100644
--- a/app-office/abiword/Manifest
+++ b/app-office/abiword/Manifest
@@ -1,15 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
-AUX abiword-2.8.6-libpng15.patch 1248 RMD160 4f6e4f6e99cf9a087a46fc4cf377650303d7f9ed SHA1 6186b59aee2fcb2f732a9629526ec62d5ca34512 SHA256 a648e144047f679bb51696e6080d1f97d2728137c4820f91e91608ffc351703f
+AUX abiword-2.8.6-libpng15.patch 3710 RMD160 7de98b2183cd21a6d538bea8fba86a1c4d35a21e SHA1 646736e4e71a92574f4ccb7bc17ae422a13f04c2 SHA256 a5ea99ba7aa00ebc3a669d6cbd019b172e576df6b2eb8349505ed18576e10e90
 DIST abiword-2.8.6.tar.gz 9218827 RMD160 caabab25d197f9553ea12376de36fc7f5a771a58 SHA1 998f69d038000b3fc027d4259548f02d67c8d0df SHA256 d99089a63a6cfc1a6a4a026be9278028d47d224088d24b1853acb67e95683a15
 EBUILD abiword-2.8.6-r1.ebuild 4576 RMD160 0423f8f86327768e121ef16045a1ec2801bc8f9e SHA1 20c1e9d6503744c3e7c3b4a775a5e2c48699e32a SHA256 6adb56eceab2a2a4063c0845214d5b6e314aba937c75f012bf1b05e5f4bc4c4f
-MISC ChangeLog 32990 RMD160 2563f16d2691ae203100f4f206103afc0b6f39da SHA1 40ebb3c4fa1bb8731c5ef6661681108e578014a3 SHA256 4ba6228c9ff453fc5d6f991bd8bd099c104ab458bf7fa01d0c0bb85aa406a09c
+MISC ChangeLog 33169 RMD160 ea1e48fdd75e9ec66a0cfe57696367312da92625 SHA1 08ea8cb9a106cb30db4cd053acccd4239702613b SHA256 882405d20493d9c3a214fac9a4f08ba89274ac0ffc50959558f7da826517b668
 MISC metadata.xml 879 RMD160 df1f57e78a294b266ece583d9c04e685fc6f2b53 SHA1 8876780818c62eb42318ba47ef68c15cc80a2a10 SHA256 68442b26d087af39be60f2b41749ae53e94073770449f80bf8f6fd2286e0be84
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk4+Uz4ACgkQXkR9YqOcLPEjnwD+OnvFKSyL5WuYLWJVwy4FsBSG
-WJRs9UZN/MovW57KS54A/i+G0Rd9YQOK8p9QOS5JU/jvaxfP/mSfWNbosZcFMxuo
-=g3Ve
+iQIcBAEBCgAGBQJOfEx3AAoJEPiazRVxLXTFutkP/jo88ehSZswL+QsE5g6Ur9U4
+9FY3VgGYikstlGbHxsi1Wk+vHQczUj75l8EWVwDz2r/uLjBLfQgCu69NxxpCYT0w
+/5vCY5kgSa4RFOv7L9G64j89O5CeglE+drIsRnZtcP+KFAzwcisTNgdHT6iyXS8+
+PhhnFMP+uk7hNTQtbxt+gcx1hvr97/vVJPf7bxq39DBaXYy7I7A6FPPfEHljfi87
+rhIhhTvAyB0OuANQsreTcX4i+gDjdD7BUxorpxwA3P8CaCDMVs+wwj6p4WwiEDEs
+LCVkHrycPpzfrhaMR83WD3/mri8JLNdmxO54PtSKLUZ1ZDeHoHDdN9H98gFZDAH9
+r8G4q3B3HxrrH6TKUqFJ6jCBiC3WPl+1OELNzXTiQKFxc6eXNyjXHJRsVcLAl+H+
+bKVIQ57sI38bC+cf61F5S190iFE7uV+hM0DkAwJFZZ2bMOmJ3nN60uAGjfW6BFts
+Zhs3EY+WbPMOD6cStsIildlXLoU5Yy2/va+VCbkSiqy9Bg39jZkFnHfLAfKA2MIp
+fNv235WVa5/sRtV5tBiU09u876imKQ4+ITLmTlFMJf0sza7yctAH+QRF10rxc7Y8
+qvLYARq43t2i2q7mJ5jygXQjgGqvwr1bnts8lXqknE45P0yYafMLvOIQ6oqTgOaS
+VePLz1noCjOW8hatA1Lu
+=huyC
 -----END PGP SIGNATURE-----
diff --git a/app-office/abiword/files/abiword-2.8.6-libpng15.patch b/app-office/abiword/files/abiword-2.8.6-libpng15.patch
index b9853e80a4fd..7eded4c837b2 100644
--- a/app-office/abiword/files/abiword-2.8.6-libpng15.patch
+++ b/app-office/abiword/files/abiword-2.8.6-libpng15.patch
@@ -1,19 +1,71 @@
-http://bugzilla.abisource.com/show_bug.cgi?id=13008
+$NetBSD: patch-plugins_bmp_xp_ie__impGraphic__BMP.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
 
---- src/af/util/xp/ut_png.cpp
-+++ src/af/util/xp/ut_png.cpp
-@@ -71,7 +71,7 @@
+Fix build with png-1.5.
+
+--- plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2009-06-25 04:02:06.000000000 +0000
++++ plugins/bmp/xp/ie_impGraphic_BMP.cpp
+@@ -191,7 +191,10 @@ UT_Error IE_ImpGraphic_BMP::_convertGrap
+ 
+ 	/* Clean Up Memory Used */
+ 		
+-	FREEP(m_pPNGInfo->palette);
++	png_colorp palette;
++	int num_palette;
++	png_get_PLTE( m_pPNG, m_pPNGInfo, &palette, &num_palette );
++	FREEP(palette);
+ 	DELETEP(pBB);
+ 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+    
+@@ -313,7 +316,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
  	 * the normal method of doing things with libpng).  REQUIRED unless you
  	 * set up your own error handlers in the png_create_read_struct() earlier.
  	 */
--	if (setjmp(png_ptr->jmpbuf))
-+	if (setjmp(png_jmpbuf(png_ptr)))
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
  	{
  		/* Free all of the memory associated with the png_ptr and info_ptr */
- 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));
---- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -332,7 +335,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+ 	UT_Error IE_ImpGraphic_BMP::Convert_BMP_Pallet(UT_ByteBuf* pBB)
+ 	{
+ 		/* Reset error handling for libpng */
+-		if (setjmp(m_pPNG->jmpbuf))
++		if (setjmp(png_jmpbuf(m_pPNG)))
+ 		{
+ 			png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+ 			return UT_ERROR;
+@@ -372,7 +375,7 @@ UT_Error IE_ImpGraphic_BMP::Initialize_P
+ UT_Error IE_ImpGraphic_BMP::Convert_BMP(UT_ByteBuf* pBB)
+ {
+ 	/* Reset error handling for libpng */
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+ 		return UT_ERROR;
+
+$NetBSD: patch-plugins_garble_xp_abiword-garble-png.cpp,v 1.1 2011/02/01 10:48:15 wiz Exp $
+
+Fix build with png-1.5.
+
+--- plugins/garble/xp/abiword-garble-png.cpp.orig	2009-09-05 15:34:44.000000000 +0000
++++ plugins/garble/xp/abiword-garble-png.cpp
+@@ -79,7 +79,7 @@ bool abiword_document::garble_png( void*
+ 		png_set_strip_alpha( png_ptr );
+ 		png_set_interlace_handling( png_ptr );
+ 		png_set_bgr( png_ptr );
+-		rowbytes = info_ptr->rowbytes;
++		rowbytes = png_get_rowbytes( png_ptr, info_ptr );
+ 		png_destroy_read_struct( &png_ptr, &info_ptr, NULL );
+ 	}
+ 
+$NetBSD: patch-af,v 1.12 2011/01/15 15:07:11 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp.orig	2009-07-01 04:02:04.000000000 +0000
 +++ src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp
-@@ -185,7 +185,7 @@
+@@ -185,7 +185,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
  /** needed for the stejmp context */
  UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
  {
@@ -22,7 +74,7 @@ http://bugzilla.abisource.com/show_bug.cgi?id=13008
  	{
  		DELETEP(m_pPngBB);
  		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
-@@ -446,7 +446,7 @@
+@@ -446,7 +446,7 @@ UT_Error IE_ImpGraphic_GdkPixbuf::Initia
  	 * the normal method of doing things with libpng).  REQUIRED unless you
  	 * set up your own error handlers in the png_create_read_struct() earlier.
  	 */
@@ -31,3 +83,18 @@ http://bugzilla.abisource.com/show_bug.cgi?id=13008
  	{
  		/* Free all of the memory associated with the png_ptr and info_ptr */
  		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+$NetBSD: patch-ae,v 1.21 2011/01/15 15:07:11 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/af/util/xp/ut_png.cpp.orig	2008-02-24 03:33:07.000000000 +0000
++++ src/af/util/xp/ut_png.cpp
+@@ -71,7 +71,7 @@ bool UT_PNG_getDimensions(const UT_ByteB
+ 	 * the normal method of doing things with libpng).  REQUIRED unless you
+ 	 * set up your own error handlers in the png_create_read_struct() earlier.
+ 	 */
+-	if (setjmp(png_ptr->jmpbuf))
++	if (setjmp(png_jmpbuf(png_ptr)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_read_struct(&png_ptr, &info_ptr, static_cast<png_infopp>(NULL));