From 1844f6080ebf1f8bb37935719ad7e029bdd82b1c Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Fri, 14 Jan 2011 10:44:27 +0000
Subject: Fix build with png-1.5.

---
 graphics/libwmf/distinfo         |  3 ++-
 graphics/libwmf/patches/patch-aa | 15 +++++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 graphics/libwmf/patches/patch-aa

(limited to 'graphics/libwmf')

diff --git a/graphics/libwmf/distinfo b/graphics/libwmf/distinfo
index 1f995f1b6cd..d796d17f924 100644
--- a/graphics/libwmf/distinfo
+++ b/graphics/libwmf/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.17 2007/09/21 12:00:11 abs Exp $
+$NetBSD: distinfo,v 1.18 2011/01/14 10:46:28 wiz Exp $
 
 SHA1 (libwmf-0.2.8.4.tar.gz) = 822ab3bd0f5e8f39ad732f2774a8e9f18fc91e89
 RMD160 (libwmf-0.2.8.4.tar.gz) = 98cd631adb5bb332d9224d04bc8a265c105435f2
 Size (libwmf-0.2.8.4.tar.gz) = 2169375 bytes
+SHA1 (patch-aa) = 211bd3d51c98eca64b0915f59492efd1697b1508
 SHA1 (patch-ad) = b74be16c5da490394b86403009f5f35d80ba4bfa
 SHA1 (patch-ae) = f5cbb60757261aaf6084e9fcf16f9074b3013538
diff --git a/graphics/libwmf/patches/patch-aa b/graphics/libwmf/patches/patch-aa
new file mode 100644
index 00000000000..b4fe1e52a2b
--- /dev/null
+++ b/graphics/libwmf/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.6 2011/01/14 10:46:28 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/ipa/ipa/bmp.h.orig	2001-10-23 11:24:12.000000000 +0000
++++ src/ipa/ipa/bmp.h
+@@ -66,7 +66,7 @@ static void ldr_bmp_png (wmfAPI* API,wmf
+ 		return;
+ 	}
+ 
+-	if (setjmp (png_ptr->jmpbuf))
++	if (setjmp (png_jmpbuf(png_ptr)))
+ 	{	WMF_DEBUG (API,"Failed to write bitmap as PNG! (setjmp failed)");
+ 		png_destroy_write_struct (&png_ptr,&info_ptr);
+ 		wmf_free (API,buffer);
-- 
cgit v1.2.3