packages: abiword/abiword-libpng15.patch (NEW)=?UTF-8?Q?=20?=- new, libpng-1.5 fixes

[adamg]

Author: adamg                        Date: Thu Feb  9 00:42:19 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- new, libpng-1.5 fixes

---- Files affected:
packages/abiword:
   abiword-libpng15.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/abiword/abiword-libpng15.patch
diff -u /dev/null packages/abiword/abiword-libpng15.patch:1.1
--- /dev/null	Thu Feb  9 01:42:19 2012
+++ packages/abiword/abiword-libpng15.patch	Thu Feb  9 01:42:14 2012
@@ -0,0 +1,80 @@
+--- abiword-2.8.6/src/af/util/xp/ut_png.cpp~	2008-02-24 04:33:07.000000000 +0100
++++ abiword-2.8.6/src/af/util/xp/ut_png.cpp	2012-02-09 01:24:18.808386895 +0100
+@@ -71,7 +71,7 @@
+ 	 * 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));
+--- abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp~	2009-07-01 06:02:04.000000000 +0200
++++ abiword-2.8.6/src/wp/impexp/gtk/ie_impGraphic_GdkPixbuf.cpp	2012-02-09 01:30:28.706559268 +0100
+@@ -185,7 +185,7 @@
+ /** needed for the stejmp context */
+ UT_Error IE_ImpGraphic_GdkPixbuf::_png_write(GdkPixbuf * pixbuf)
+ {
+-	if (setjmp(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		DELETEP(m_pPngBB);
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -446,7 +446,7 @@
+ 	 * 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(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+--- abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp~	2009-09-05 17:34:44.000000000 +0200
++++ abiword-2.8.6/plugins/garble/xp/abiword-garble-png.cpp	2012-02-09 01:33:01.223765531 +0100
+@@ -79,7 +79,7 @@
+ 		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 );
+ 	}
+ 
+--- abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp.orig	2012-02-09 01:34:30.630725875 +0100
++++ abiword-2.8.6/plugins/bmp/xp/ie_impGraphic_BMP.cpp	2012-02-09 01:35:26.257576459 +0100
+@@ -191,7 +191,7 @@
+ 
+ 	/* Clean Up Memory Used */
+ 		
+-	FREEP(m_pPNGInfo->palette);
++	FREEP(m_pPNGInfo);
+ 	DELETEP(pBB);
+ 	png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+    
+@@ -313,7 +313,7 @@
+ 	 * 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(m_pPNG->jmpbuf))
++	if (setjmp(png_jmpbuf(m_pPNG)))
+ 	{
+ 		/* Free all of the memory associated with the png_ptr and info_ptr */
+ 		png_destroy_write_struct(&m_pPNG, &m_pPNGInfo);
+@@ -332,7 +332,7 @@
+ 	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 +372,7 @@
+ 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;
================================================================