Gentoo Archives: gentoo-commits

From: "Theo Chatzimichos (tampakrap)" <tampakrap@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-base/kcontrol/files: kcontrol-3.5.10-gcc44.patch
Date: Sat, 30 May 2009 11:01:09
Message-Id: E1MAMJI-0000PQ-4S@stork.gentoo.org
1 tampakrap 09/05/30 11:01:08
2
3 Added: kcontrol-3.5.10-gcc44.patch
4 Log:
5 Add patch for gcc-4.4, thanks to Robert Forster
6 (Portage version: 2.2_rc33/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/kde-base/kcontrol/files/kcontrol-3.5.10-gcc44.patch?rev=1.1&content-type=text/plain
13
14 Index: kcontrol-3.5.10-gcc44.patch
15 ===================================================================
16 --- branches/KDE/3.5/kdebase/kcontrol/kfontinst/kfontinst/Fontmap.cpp 2005/12/02 23:52:28 485133
17 +++ branches/KDE/3.5/kdebase/kcontrol/kfontinst/kfontinst/Fontmap.cpp 2009/05/30 00:34:35 975372
18 @@ -44,7 +44,7 @@
19
20 using namespace std;
21
22 -static char * findSpace(char *str)
23 +static const char * findSpace(const char *str)
24 {
25 while(str && *str!=' ' && *str!='\t')
26 str++;
27 @@ -65,7 +65,7 @@
28 char a[constMaxLen+1],
29 b[constFileMaxLen+1];
30
31 - char *slash1=strchr(line, '/'),
32 + const char *slash1=strchr(line, '/'),
33 *space1=slash1 ? findSpace(slash1) : NULL, //strchr(slash1, ' ') : NULL,
34 *ob=slash1 ? strchr(slash1, '(') : NULL,
35 *cb=ob ? strchr(ob, ')') : NULL,