summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authortnn <tnn@pkgsrc.org>2011-01-15 22:42:48 +0000
committertnn <tnn@pkgsrc.org>2011-01-15 22:42:48 +0000
commita95d8f629d89a2d85bb5857c572b87846badaa1c (patch)
tree814003543179af75b2488f4ce812ff358d9851f8 /graphics
parent4ddee202203ae7382565c4ecc4031e163947127b (diff)
downloadpkgsrc-a95d8f629d89a2d85bb5857c572b87846badaa1c.tar.gz
fix libpng-1.5 fallout
Diffstat (limited to 'graphics')
-rw-r--r--graphics/feh/distinfo3
-rw-r--r--graphics/feh/patches/patch-af24
2 files changed, 26 insertions, 1 deletions
diff --git a/graphics/feh/distinfo b/graphics/feh/distinfo
index 8e6772c93c1..b32b71d8dfa 100644
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.17 2006/02/26 21:37:19 joerg Exp $
+$NetBSD: distinfo,v 1.18 2011/01/15 22:42:48 tnn Exp $
SHA1 (feh-1.3.4.tar.gz) = cf02fd48325ba02467c7f791634a28e98edbe801
RMD160 (feh-1.3.4.tar.gz) = 7e27d31cf974b30fc321d4dbef2fd46fbd21d34c
@@ -8,3 +8,4 @@ SHA1 (patch-ab) = 1899f65deb3a5c3d9825b381298b752f0bec54cc
SHA1 (patch-ac) = a0c76aebd0d38c990e12259d7ceb9e4d75920401
SHA1 (patch-ad) = 7a3a5a5a88ffa65942606501181e6e9c09af5a56
SHA1 (patch-ae) = 45c0a837c53393597d0617ff64bdf7fbf5aaa814
+SHA1 (patch-af) = f664f257c7466295e83e76eb9b13710aff2a360c
diff --git a/graphics/feh/patches/patch-af b/graphics/feh/patches/patch-af
new file mode 100644
index 00000000000..e54118a0b6d
--- /dev/null
+++ b/graphics/feh/patches/patch-af
@@ -0,0 +1,24 @@
+$NetBSD: patch-af,v 1.1 2011/01/15 22:42:49 tnn Exp $
+
+Be compatible with png>=1.5.
+
+--- src/feh_png.c.orig 2005-07-14 11:59:03.000000000 +0000
++++ src/feh_png.c
+@@ -68,7 +68,7 @@ feh_png_read_comments(char *file)
+ return hash;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
+ fclose(fp);
+@@ -129,7 +129,7 @@ feh_png_write_png(Imlib_Image image, cha
+ return 0;
+ }
+
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ {
+ fclose(fp);
+ png_destroy_write_struct(&png_ptr, &info_ptr);