summaryrefslogtreecommitdiff
path: root/x11/kdebase3
diff options
context:
space:
mode:
authormarkd <markd@pkgsrc.org>2011-01-18 10:25:52 +0000
committermarkd <markd@pkgsrc.org>2011-01-18 10:25:52 +0000
commit1efce5e83c17d7764173ccd1ca64011cfdc4fad8 (patch)
treeb4dfc42722357be14ed34e73982e4e38f24982c8 /x11/kdebase3
parent553a4c614a4961bfbc7fb7d7c363b5ff97ed715f (diff)
downloadpkgsrc-1efce5e83c17d7764173ccd1ca64011cfdc4fad8.tar.gz
Fix build with gcc 4.4
Diffstat (limited to 'x11/kdebase3')
-rw-r--r--x11/kdebase3/distinfo3
-rw-r--r--x11/kdebase3/patches/patch-av24
2 files changed, 26 insertions, 1 deletions
diff --git a/x11/kdebase3/distinfo b/x11/kdebase3/distinfo
index 8ed141eddb3..cbd61a5ff22 100644
--- a/x11/kdebase3/distinfo
+++ b/x11/kdebase3/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.110 2009/09/01 09:51:02 wiz Exp $
+$NetBSD: distinfo,v 1.111 2011/01/18 10:25:52 markd Exp $
SHA1 (Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b
RMD160 (Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4
@@ -29,6 +29,7 @@ SHA1 (patch-aq) = 8cdc56fb3ca1646983790b6bb20b62ac04e41aa2
SHA1 (patch-ar) = 0584037f39827a4b0e9859e39546295f2d7d8f5e
SHA1 (patch-at) = 55aa213937c858984785500a56bad655196eeaec
SHA1 (patch-au) = 49fcdbef0409bc657d5fc20c4f391924df72cf4b
+SHA1 (patch-av) = cc28cc463aff2cfefcfc49e6601253afdd00bddb
SHA1 (patch-bb) = 4c85002b95661db18619283e50512f3ab131a0ba
SHA1 (patch-bc) = 63983ae5110a8fa85621f39848aff2113207d02c
SHA1 (patch-bx) = d58d16fd484fc0a46c1ae93267af19e73af6f990
diff --git a/x11/kdebase3/patches/patch-av b/x11/kdebase3/patches/patch-av
new file mode 100644
index 00000000000..8695d46aeb1
--- /dev/null
+++ b/x11/kdebase3/patches/patch-av
@@ -0,0 +1,24 @@
+$NetBSD: patch-av,v 1.4 2011/01/18 10:25:52 markd Exp $
+
+svn revision 975372 fix build with gcc 4.4
+
+--- kcontrol/kfontinst/kfontinst/Fontmap.cpp.orig 2006-01-19 17:00:49.000000000 +0000
++++ kcontrol/kfontinst/kfontinst/Fontmap.cpp
+@@ -44,7 +44,7 @@
+
+ using namespace std;
+
+-static char * findSpace(char *str)
++static const char * findSpace(const char *str)
+ {
+ while(str && *str!=' ' && *str!='\t')
+ str++;
+@@ -65,7 +65,7 @@ static bool parseLine(const char *line,
+ char a[constMaxLen+1],
+ b[constFileMaxLen+1];
+
+- char *slash1=strchr(line, '/'),
++ const char *slash1=strchr(line, '/'),
+ *space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL,
+ *ob=slash1 ? strchr(slash1, '(') : NULL,
+ *cb=ob ? strchr(ob, ')') : NULL,