From 3d3a6e900ba472c50a2f854fde370614a732d349 Mon Sep 17 00:00:00 2001
From: wiz <wiz@pkgsrc.org>
Date: Sat, 15 Jan 2011 15:07:11 +0000
Subject: Fix build with png-1.5.

---
 editors/abiword/distinfo         |  4 +++-
 editors/abiword/patches/patch-ae | 15 +++++++++++++++
 editors/abiword/patches/patch-af | 24 ++++++++++++++++++++++++
 3 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 editors/abiword/patches/patch-ae
 create mode 100644 editors/abiword/patches/patch-af

(limited to 'editors/abiword')

diff --git a/editors/abiword/distinfo b/editors/abiword/distinfo
index f1cd5eb8c35..51a9f49a40f 100644
--- a/editors/abiword/distinfo
+++ b/editors/abiword/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.60 2010/11/26 14:49:49 adam Exp $
+$NetBSD: distinfo,v 1.61 2011/01/15 15:07:11 wiz Exp $
 
 SHA1 (abiword-2.8.6.tar.gz) = 998f69d038000b3fc027d4259548f02d67c8d0df
 RMD160 (abiword-2.8.6.tar.gz) = caabab25d197f9553ea12376de36fc7f5a771a58
@@ -7,4 +7,6 @@ SHA1 (patch-aa) = dea737eb09e271f99e2b50f5ffc3037a68116451
 SHA1 (patch-ab) = fa589d531c08bf293eeeaa9a775015e27eaf6da4
 SHA1 (patch-ac) = a82fd781195e9ff52dbc33258fd4774cd23fe5c9
 SHA1 (patch-ad) = 48ff4fcce593f9996e90cce718b2f774b271d5a3
+SHA1 (patch-ae) = ec3bb0a00100fea97f46b3a25440d7a4e46e30eb
+SHA1 (patch-af) = fc6927eb963c4be956825d1656e8957b358ed1ad
 SHA1 (patch-sa) = 29ee7e9891b11773217ec73bbda01e2591e78b56
diff --git a/editors/abiword/patches/patch-ae b/editors/abiword/patches/patch-ae
new file mode 100644
index 00000000000..27025e83fa2
--- /dev/null
+++ b/editors/abiword/patches/patch-ae
@@ -0,0 +1,15 @@
+$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));
diff --git a/editors/abiword/patches/patch-af b/editors/abiword/patches/patch-af
new file mode 100644
index 00000000000..7dd327da287
--- /dev/null
+++ b/editors/abiword/patches/patch-af
@@ -0,0 +1,24 @@
+$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 @@ UT_Error IE_ImpGraphic_GdkPixbuf::import
+ /** 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 @@ 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.
+ 	 */
+-	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);
-- 
cgit v1.2.3