summaryrefslogtreecommitdiff
path: root/wm
diff options
context:
space:
mode:
authorhans <hans@pkgsrc.org>2011-05-17 10:36:45 +0000
committerhans <hans@pkgsrc.org>2011-05-17 10:36:45 +0000
commit4a29f7aecea7bacc3e7cc967388fec110000f098 (patch)
tree8cc4945b9de8224ddf03177e8c9708784f6f2c03 /wm
parent252f6732ac3ed1a619f406954a65fab008f83894 (diff)
downloadpkgsrc-4a29f7aecea7bacc3e7cc967388fec110000f098.tar.gz
Fix the previous fix for png 1.5, makes png icons work again.
Diffstat (limited to 'wm')
-rw-r--r--wm/windowmaker/distinfo4
-rw-r--r--wm/windowmaker/patches/patch-ao4
2 files changed, 4 insertions, 4 deletions
diff --git a/wm/windowmaker/distinfo b/wm/windowmaker/distinfo
index d8828f31cf1..a8ba6290d91 100644
--- a/wm/windowmaker/distinfo
+++ b/wm/windowmaker/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.29 2011/01/14 19:41:10 tron Exp $
+$NetBSD: distinfo,v 1.30 2011/05/17 10:36:45 hans Exp $
SHA1 (WindowMaker-0.92.0.tar.bz2) = 4f7fea6f40b9ba9f870d2e2f0ce46274750edb2c
RMD160 (WindowMaker-0.92.0.tar.bz2) = c161eee64092fafb4868181fe2a0b6db96ed6de0
@@ -16,4 +16,4 @@ SHA1 (patch-aj) = 9d993770f77cd53d005b1f2c81baff49831fe96a
SHA1 (patch-ak) = aca311941e7c2fa7860934cd029ff87fde96c8ff
SHA1 (patch-al) = b900fcc52c3fb5b5184b28e22c29e111317ea7ad
SHA1 (patch-am) = b25f546dc8192cfa910461e3dc5111703aecc586
-SHA1 (patch-ao) = 50e4156541ef0f7b6ceef5059c40e8fd9a097fc8
+SHA1 (patch-ao) = bdff72c638f6bef666b46a8ad6300742fe3cb12d
diff --git a/wm/windowmaker/patches/patch-ao b/wm/windowmaker/patches/patch-ao
index 9d8fb427a78..0a19989f318 100644
--- a/wm/windowmaker/patches/patch-ao
+++ b/wm/windowmaker/patches/patch-ao
@@ -1,4 +1,4 @@
-$NetBSD: patch-ao,v 1.1 2011/01/14 19:41:10 tron Exp $
+$NetBSD: patch-ao,v 1.2 2011/05/17 10:36:45 hans Exp $
Fix build with "png" 1.5.1beta01 and newer.
@@ -9,7 +9,7 @@ Fix build with "png" 1.5.1beta01 and newer.
RErrorCode = RERR_INTERNAL;
- if (setjmp(png->jmpbuf)) {
-+ if (png_jmpbuf(png)) {
++ if (setjmp(png_jmpbuf(png))) {
fclose(f);
png_destroy_read_struct(&png, &pinfo, &einfo);
if (image)