summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-01-26 09:29:26 +0000
committerwiz <wiz@pkgsrc.org>2011-01-26 09:29:26 +0000
commit9b4813821d6b9960fc9a3a43f5b7525ec148ba75 (patch)
treec88840c28be9a6be76e70ac8792645d8e4d11b60 /math
parent14b009a163de27ca7e7dd786571fc54a701f49ca (diff)
downloadpkgsrc-9b4813821d6b9960fc9a3a43f5b7525ec148ba75.tar.gz
Fix build with png-1.5. Problem reported by chuck.
Diffstat (limited to 'math')
-rw-r--r--math/grace/distinfo3
-rw-r--r--math/grace/patches/patch-ac23
2 files changed, 25 insertions, 1 deletions
diff --git a/math/grace/distinfo b/math/grace/distinfo
index 14ea5beb963..ffc3ab35797 100644
--- a/math/grace/distinfo
+++ b/math/grace/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.9 2008/07/18 17:22:47 obache Exp $
+$NetBSD: distinfo,v 1.10 2011/01/26 09:29:26 wiz Exp $
SHA1 (grace-5.1.22.tar.gz) = 3ce88c7c264d2de73b8935f835a1c1f8e368c78f
RMD160 (grace-5.1.22.tar.gz) = ca7b1abe240de7cd3dbdc52d5182020c410b9772
Size (grace-5.1.22.tar.gz) = 2516576 bytes
SHA1 (patch-aa) = 5ccd1cc8bbf449c92b2216a52f1e6b9d6bd4cfce
SHA1 (patch-ab) = 60a7657a4d191b76dae97ba0a7d8ba378da2a748
+SHA1 (patch-ac) = ef66aa5ae9152ff6260b31424eb4746ff6aaddf3
diff --git a/math/grace/patches/patch-ac b/math/grace/patches/patch-ac
new file mode 100644
index 00000000000..1d37343fb9c
--- /dev/null
+++ b/math/grace/patches/patch-ac
@@ -0,0 +1,23 @@
+$NetBSD: patch-ac,v 1.1 2011/01/26 09:29:26 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/rstdrv.c.orig 2004-07-03 20:47:46.000000000 +0000
++++ src/rstdrv.c
+@@ -54,6 +54,7 @@
+
+ #ifdef HAVE_LIBPNG
+ # include <png.h>
++# include <zlib.h>
+ #endif
+
+ #ifndef NONE_GUI
+@@ -885,7 +886,7 @@ static void rstImagePng(gdImagePtr ihand
+ return;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_write_struct(&png_ptr, &info_ptr);
+ return;
+ }