summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authortron <tron>2011-01-14 19:41:10 +0000
committertron <tron>2011-01-14 19:41:10 +0000
commit1e492469041bca9e39221cb953d1a9eb2532be29 (patch)
tree08b03b9c02ce04e25e8e4a06caa84c864365a91f /wm
parentce68c4fe4e36719ef9847f106ebffe2e21202af3 (diff)
downloadpkgsrc-1e492469041bca9e39221cb953d1a9eb2532be29.tar.gz
Fix build with the latest version of the "png" package.
Diffstat (limited to 'wm')
-rw-r--r--wm/windowmaker/distinfo3
-rw-r--r--wm/windowmaker/patches/patch-ao15
2 files changed, 17 insertions, 1 deletions
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index cd57b9552d6..d8828f31cf1 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.28 2010/04/21 05:43:28 wiz Exp $
+$NetBSD: distinfo,v 1.29 2011/01/14 19:41:10 tron Exp $
SHA1 (WindowMaker-0.92.0.tar.bz2) = 4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c
RMD160 (WindowMaker-0.92.0.tar.bz2) = c161eee64092fafb4868181fe2a0b6db96ed6de0
@@ -16,3 +16,4 @@ SHA1 (patch-aj) = 9d993770f77cd53d005b1f2c81baff49831fe96a
SHA1 (patch-ak) = aca311941e7c2fa7860934cd029ff87fde96c8ff
SHA1 (patch-al) = b900fcc52c3fb5b5184b28e22c29e111317ea7ad
SHA1 (patch-am) = b25f546dc8192cfa910461e3dc5111703aecc586
+SHA1 (patch-ao) = 50e4156541ef0f7b6ceef5059c40e8fd9a097fc8
diff --git a/wm/windowmaker/patches/patch-ao b/wm/windowmaker/patches/patch-ao
new file mode 100644
index 00000000000..9d8fb427a78
--- /dev/null
+++ b/wm/windowmaker/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2011/01/14 19:41:10 tron Exp $
+
+Fix build with "png" 1.5.1beta01 and newer.
+
+--- wrlib/png.c.orig 2004-10-12 19:22:04.000000000 +0100
++++ wrlib/png.c 2011-01-14 19:38:22.000000000 +0000
+@@ -97,7 +97,7 @@
+ }
+
+ RErrorCode = RERR_INTERNAL;
+- if (setjmp(png->jmpbuf)) {
++ if (png_jmpbuf(png)) {
+ fclose(f);
+ png_destroy_read_struct(&png, &pinfo, &einfo);
+ if (image)