summaryrefslogtreecommitdiff
path: root/graphics/showimg
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2011-01-29 22:00:59 +0000
committermarkd <markd@pkgsrc.org>2011-01-29 22:00:59 +0000
commitaaa721f2bc0599e54c02b803244e55f575839ba4 (patch)
treede6ebc5ac6cad6e0e0dca092f32600c20c01b6f1 /graphics/showimg
parent1569f038b9cf6147b87fd8bfa2d552cd79e97ca7 (diff)
downloadpkgsrc-aaa721f2bc0599e54c02b803244e55f575839ba4.tar.gz
fix build with gcc4.5
Diffstat (limited to 'graphics/showimg')
-rw-r--r--graphics/showimg/distinfo5
-rw-r--r--graphics/showimg/patches/patch-aa14
-rw-r--r--graphics/showimg/patches/patch-ab15
3 files changed, 29 insertions, 5 deletions
diff --git a/graphics/showimg/distinfo b/graphics/showimg/distinfo
index e66534ccb3d..c4ce84048f9 100644
--- a/graphics/showimg/distinfo
+++ b/graphics/showimg/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.4 2006/10/14 21:26:47 markd Exp $
+$NetBSD: distinfo,v 1.5 2011/01/29 22:00:59 markd Exp $
SHA1 (showimg-0.9.5.tar.bz2) = 59d3a1f1a22761e0576d98e6cc6f430cc3822643
RMD160 (showimg-0.9.5.tar.bz2) = 150dc74f400b72a22f6a117aa3acd8201a059a39
Size (showimg-0.9.5.tar.bz2) = 4117897 bytes
-SHA1 (patch-aa) = 8d12f174ef4e1d75b877cafa14a982b8f3126cb0
+SHA1 (patch-aa) = 90d10f0989e66c29e8a9bae4ee51527818bc0cb1
+SHA1 (patch-ab) = 0d90531ac8edc44cff1d6533548f5d564e2e373f
diff --git a/graphics/showimg/patches/patch-aa b/graphics/showimg/patches/patch-aa
index 4999d32c880..d09daf458e2 100644
--- a/graphics/showimg/patches/patch-aa
+++ b/graphics/showimg/patches/patch-aa
@@ -1,8 +1,16 @@
-$NetBSD: patch-aa,v 1.1 2006/10/14 21:26:47 markd Exp $
+$NetBSD: patch-aa,v 1.2 2011/01/29 22:00:59 markd Exp $
---- showimg/showimg/imagelistview.cpp.orig 2006-01-07 21:48:04.000000000 +1300
+--- showimg/showimg/imagelistview.cpp.orig 2006-01-07 08:48:04.000000000 +0000
+++ showimg/showimg/imagelistview.cpp
-@@ -542,7 +542,9 @@ ImageListView::initMenu(KActionCollectio
+@@ -108,6 +108,7 @@
+ #include <qstringlist.h>
+ #include <qlistview.h>
+ #include <qtextcodec.h>
++#include <cstdlib>
+
+ #define MYDEBUG kdDebug(0)<<__FILE__<<" " <<__LINE__ << " " << __FUNCTION__ << " "
+
+@@ -542,7 +543,9 @@ ImageListView::initMenu(KActionCollectio
////////
m_popup->insertSeparator();
aImageInfo->plug(m_popup);
diff --git a/graphics/showimg/patches/patch-ab b/graphics/showimg/patches/patch-ab
new file mode 100644
index 00000000000..f2bd832620d
--- /dev/null
+++ b/graphics/showimg/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.1 2011/01/29 22:00:59 markd Exp $
+
+fix build with gcc4.5
+
+--- showimg/showimg/misc/exif.cpp.orig 2006-01-07 08:47:58.000000000 +0000
++++ showimg/showimg/misc/exif.cpp
+@@ -409,7 +409,7 @@ static void RelativeName(char * OutFileN
+ // If the filename contains substring "&i", then substitute the
+ // filename for that. This gives flexibility in terms of processing
+ // multiple files at a time.
+- char * Subst;
++ const char * Subst;
+ Subst = strstr(NamePattern, "&i");
+ if (Subst){
+ strncpy(OutFileName, NamePattern, Subst-NamePattern);