summaryrefslogtreecommitdiff
path: root/time
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-01-31 20:23:10 +0000
committerwiz <wiz@pkgsrc.org>2011-01-31 20:23:10 +0000
commit1da0eb6196cb936a80eb394424d0a4321aeb755d (patch)
tree155d8b4db0626a9d72d98d4fb1426d724ce3d002 /time
parent2168583e61d0aab6f0fdbfa7936265d629b059a3 (diff)
downloadpkgsrc-1da0eb6196cb936a80eb394424d0a4321aeb755d.tar.gz
Fix build with png-1.5.
Diffstat (limited to 'time')
-rw-r--r--time/xonclock/distinfo3
-rw-r--r--time/xonclock/patches/patch-aa15
-rw-r--r--time/xtide/distinfo3
-rw-r--r--time/xtide/patches/patch-ae15
4 files changed, 34 insertions, 2 deletions
diff --git a/time/xonclock/distinfo b/time/xonclock/distinfo
index fa4202714cf..dcd4fd3e4dc 100644
--- a/time/xonclock/distinfo
+++ b/time/xonclock/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/12/17 20:16:37 drochner Exp $
+$NetBSD: distinfo,v 1.2 2011/01/31 20:25:51 wiz Exp $
SHA1 (xonclock-0.0.9.2.tar.gz) = e29fb4709a973181b1f53e22a3dbcdae758a38da
RMD160 (xonclock-0.0.9.2.tar.gz) = ccbd11a30cdca65aaccc8eee50229ba47e9f3184
Size (xonclock-0.0.9.2.tar.gz) = 410786 bytes
+SHA1 (patch-aa) = 7977c0a98e2f16c77e4618326aa9806e3cbc4cdd
diff --git a/time/xonclock/patches/patch-aa b/time/xonclock/patches/patch-aa
new file mode 100644
index 00000000000..1e68210ee23
--- /dev/null
+++ b/time/xonclock/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.1 2011/01/31 20:25:51 wiz Exp $
+
+Fix build with png-1.5.
+
+--- src/loaders/png.c.orig 2007-09-16 11:01:50.000000000 +0000
++++ src/loaders/png.c
+@@ -110,7 +110,7 @@ read_png(const char * filename,
+ goto err;
+ }
+
+- if (setjmp(png_ptr->jmpbuf)) {
++ if (setjmp(png_jmpbuf(png_ptr))) {
+ png_destroy_read_struct(&png_ptr, &info_ptr,
+ (png_infopp) NULL);
+ msg("libpng error catched");
diff --git a/time/xtide/distinfo b/time/xtide/distinfo
index 8b6b9792883..4c73ed587e4 100644
--- a/time/xtide/distinfo
+++ b/time/xtide/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2010/03/14 16:39:24 wiz Exp $
+$NetBSD: distinfo,v 1.2 2011/01/31 20:23:10 wiz Exp $
SHA1 (harmonics-dwf-20060708.tcd.bz2) = 1f54ed856b064e485f7e386eb4a71965e83abfa4
RMD160 (harmonics-dwf-20060708.tcd.bz2) = 754255ac5f2e36cf2dce587e7f9f7bd0561226d9
@@ -10,3 +10,4 @@ SHA1 (patch-aa) = 8b9059e2870f6b8149e72ca33c452e75650f8230
SHA1 (patch-ab) = 889c68bce0bd78cfc1b5f7410364e8c39182cfec
SHA1 (patch-ac) = 07a0099f0d58b8774ae456470142314dabe38c1b
SHA1 (patch-ad) = cf18fb73096b3cef07fbf501fa1205fe126d1155
+SHA1 (patch-ae) = d93d25768341ac52a7379e4d4043c8f799072329
diff --git a/time/xtide/patches/patch-ae b/time/xtide/patches/patch-ae
new file mode 100644
index 00000000000..9858f02f437
--- /dev/null
+++ b/time/xtide/patches/patch-ae
@@ -0,0 +1,15 @@
+$NetBSD: patch-ae,v 1.1 2011/01/31 20:23:10 wiz Exp $
+
+Fix build with png-1.5.
+
+--- RGBGraph.cc.orig 2006-03-14 01:59:34.000000000 +0000
++++ RGBGraph.cc
+@@ -118,7 +118,7 @@ RGBGraph::writeAsPNG (png_rw_ptr write_d
+ /* Set error handling. REQUIRED if you aren't supplying your own
+ * error hadnling functions in the png_create_write_struct() call.
+ */
+- if (setjmp(png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(png_ptr)))
+ barf (PNG_WRITE_FAILURE);
+
+ /* set up the output control if you are using standard C streams */