summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorobache <obache>2012-05-19 06:43:23 +0000
committerobache <obache>2012-05-19 06:43:23 +0000
commit94a804a935a3fa04c589a6d39260d0c61bdc48cf (patch)
treecb70e86f3720b6ba79eed9684042fda769144398 /graphics
parent6ffc57d786691ed043a07b48827ea753e26ca4ca (diff)
downloadpkgsrc-94a804a935a3fa04c589a6d39260d0c61bdc48cf.tar.gz
fixes build with modern C++.
Diffstat (limited to 'graphics')
-rw-r--r--graphics/zphoto/distinfo4
-rw-r--r--graphics/zphoto/patches/patch-ac16
2 files changed, 17 insertions, 3 deletions
diff --git a/graphics/zphoto/distinfo b/graphics/zphoto/distinfo
index a336d21455a..8a51a3c46d6 100644
--- a/graphics/zphoto/distinfo
+++ b/graphics/zphoto/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2008/02/12 13:56:48 obache Exp $
+$NetBSD: distinfo,v 1.5 2012/05/19 06:43:23 obache Exp $
SHA1 (zphoto-1.2.tar.gz) = 2d45c5df2f2a00db0d8170f18ea5ed399fb9d611
RMD160 (zphoto-1.2.tar.gz) = 54a93da3c8303ebbf9c505891e9fa8fb32bd6a64
Size (zphoto-1.2.tar.gz) = 414079 bytes
SHA1 (patch-aa) = 4c15d45ecfbefadc4b9b2195e00d005e3ed2a936
SHA1 (patch-ab) = d365aeba430374b3ba6b4f1f88731f3b809fca31
-SHA1 (patch-ac) = b810ce437c8bc7be796e7206f99300422fb9467c
+SHA1 (patch-ac) = 5f23d2b9611f403409902fdc7cb4ac2218b1cafb
SHA1 (patch-ad) = cda6e504d5d88cdf1ae202ce1bad786313546f3d
diff --git a/graphics/zphoto/patches/patch-ac b/graphics/zphoto/patches/patch-ac
index 7802785094f..e9711b867b6 100644
--- a/graphics/zphoto/patches/patch-ac
+++ b/graphics/zphoto/patches/patch-ac
@@ -1,4 +1,7 @@
-$NetBSD: patch-ac,v 1.1 2007/11/17 01:47:02 obache Exp $
+$NetBSD: patch-ac,v 1.2 2012/05/19 06:43:23 obache Exp $
+
+* fixes build with Imlib2 missing x11 support.
+* fixes `const char*' handling with modern C++.
--- image.cpp.orig 2004-07-20 16:48:11.000000000 +0000
+++ image.cpp
@@ -18,3 +21,14 @@ $NetBSD: patch-ac,v 1.1 2007/11/17 01:47:02 obache Exp $
#include <Imlib2.h>
static Imlib_Image
+@@ -554,8 +552,8 @@ restore_mtime (const char *file_name, ti
+ static int
+ convert_needed_p (const char *src, const char *dest)
+ {
+- char *suffix1 = strrchr(src, '.');
+- char *suffix2 = strrchr(dest, '.');
++ const char *suffix1 = strrchr(src, '.');
++ const char *suffix2 = strrchr(dest, '.');
+
+ return strcmp(suffix1, suffix2) != 0;
+ }