summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo Chatzimichos <tampakrap@gentoo.org>2009-05-30 11:01:08 +0000
committerTheo Chatzimichos <tampakrap@gentoo.org>2009-05-30 11:01:08 +0000
commit777e7a5654e4b315f7dc2afe9ab42b0295432359 (patch)
tree262a627c8822f648d1e6137e38112fbde64c7441 /kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch
parentVersion bump to install shared libraries. (diff)
downloadgentoo-2-777e7a5654e4b315f7dc2afe9ab42b0295432359.tar.gz
gentoo-2-777e7a5654e4b315f7dc2afe9ab42b0295432359.tar.bz2
gentoo-2-777e7a5654e4b315f7dc2afe9ab42b0295432359.zip
Add patch for gcc-4.4, thanks to Robert Forster
(Portage version: 2.2_rc33/cvs/Linux x86_64)
Diffstat (limited to 'kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch')
-rw-r--r--kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch20
1 files changed, 20 insertions, 0 deletions
diff --git a/kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch b/kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch
new file mode 100644
index 000000000000..d11a7b91d450
--- /dev/null
+++ b/kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch
@@ -0,0 +1,20 @@
+--- branches/KDE/3.5/kdebase/kcontrol/kfontinst/kfontinst/Fontmap.cpp 2005/12/02 23:52:28 485133
++++ branches/KDE/3.5/kdebase/kcontrol/kfontinst/kfontinst/Fontmap.cpp 2009/05/30 00:34:35 975372
+@@ -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 @@
+ 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,