diff options
| author | prlw1 <prlw1@pkgsrc.org> | 2013-02-17 15:03:01 +0000 |
|---|---|---|
| committer | prlw1 <prlw1@pkgsrc.org> | 2013-02-17 15:03:01 +0000 |
| commit | 7833cf36bc793fe3fdcdd27b9a0c13b3413d8336 (patch) | |
| tree | bc9bcc773705bcc096786cda1f9d942c144a0e2e /x11 | |
| parent | df73e3145f57287e43fb2fe58afb080a5ae1cf14 (diff) | |
| download | pkgsrc-7833cf36bc793fe3fdcdd27b9a0c13b3413d8336.tar.gz | |
Starting with libpng-1.6.0 string.h is not longer included in png.h
Diffstat (limited to 'x11')
| -rw-r--r-- | x11/fltk2/distinfo | 4 | ||||
| -rw-r--r-- | x11/fltk2/patches/patch-ag | 17 |
2 files changed, 16 insertions, 5 deletions
diff --git a/x11/fltk2/distinfo b/x11/fltk2/distinfo index ee607868bff..13a01b9f976 100644 --- a/x11/fltk2/distinfo +++ b/x11/fltk2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2011/10/30 11:13:12 marino Exp $ +$NetBSD: distinfo,v 1.6 2013/02/17 15:03:01 prlw1 Exp $ SHA1 (fltk-2.0.x-r6129.tar.bz2) = fafb9e5309127e5dd3e127ecf83f410312a427b5 RMD160 (fltk-2.0.x-r6129.tar.bz2) = a43d9603fdbf12fd0deefbad7e5ef5dd8f0a1c6f @@ -9,5 +9,5 @@ SHA1 (patch-ac) = 5fdd8cfe380b6eb2b25f62f809e256e5c0f5dede SHA1 (patch-ad) = 21e2f9cb1406c989a83cac37a9ce39ee462f6088 SHA1 (patch-ae) = 8711184bfcbc2882d115e06cb9716c37349b04c3 SHA1 (patch-af) = ff5648e8c6b935bccb77a8afe09d247f3313c76a -SHA1 (patch-ag) = 3e24e2d748bd7cfbe786359032b6357a6fd7da4c +SHA1 (patch-ag) = de60c4a5a2c9ad28e35eebe83a8f06fc298be748 SHA1 (patch-ah) = 6e098dbcecb3bd307312d94842f5f80fabf2c75f diff --git a/x11/fltk2/patches/patch-ag b/x11/fltk2/patches/patch-ag index dda5206df9c..2825da88f95 100644 --- a/x11/fltk2/patches/patch-ag +++ b/x11/fltk2/patches/patch-ag @@ -1,11 +1,22 @@ -$NetBSD: patch-ag,v 1.2 2011/01/29 14:58:50 wiz Exp $ +$NetBSD: patch-ag,v 1.3 2013/02/17 15:03:01 prlw1 Exp $ -Fix build with png-1.5. +Fix build with png-1.5 (setjmp) http://www.fltk.org/str.php?L2363+P0+S-2+C0+I0+E0+Q +Fix build with png-1.6 (string.h) --- images/fl_png.cxx.orig 2007-04-16 14:48:06.000000000 +0000 +++ images/fl_png.cxx -@@ -111,7 +111,7 @@ bool pngImage::fetch() +@@ -38,7 +38,8 @@ extern "C" + #endif + } + +-# include <stdlib.h> ++#include <stdlib.h> ++#include <string.h> + + static png_bytep cur_datas; + +@@ -111,7 +112,7 @@ bool pngImage::fetch() png_set_sig_bytes(png_ptr, 8); } |