Add patch for gcc-4.4, thanks to Robert Forster

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

4 files changed, 41 insertions, 4 deletions

diff --git a/kde-base/kcontrol/ChangeLog b/kde-base/kcontrol/ChangeLog
index ec60c3ac2929..9c93d37f78a1 100644
--- a/kde-base/kcontrol/ChangeLog
+++ b/kde-base/kcontrol/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kcontrol
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.143 2009/05/16 09:03:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/ChangeLog,v 1.144 2009/05/30 11:01:07 tampakrap Exp $
+
+  30 May 2009; Theo Chatzimichos <tampakrap@gentoo.org>
+  kcontrol-3.5.10.ebuild, +files/kcontrol-3.5.10-gcc44.patch:
+  Add patch for gcc-4.4, thanks to Robert Forster
 
   16 May 2009; Robin H. Johnson <robbat2@gentoo.org> kcontrol-3.5.9.ebuild,
   kcontrol-3.5.10.ebuild:
diff --git a/kde-base/kcontrol/Manifest b/kde-base/kcontrol/Manifest
index 33334307897d..271c6ef2b4d5 100644
--- a/kde-base/kcontrol/Manifest
+++ b/kde-base/kcontrol/Manifest
@@ -1,12 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX kcontrol-3.5.10-gcc44.patch 721 RMD160 e06ef003efc2d9a475af2bc82f5c9cd923be42da SHA1 193bda3755a9e4cb1a0ce50d7cf19de87be0f698 SHA256 a23fe4f459532799637bf5ca746001d32ead32a21d7126497836887260d6f57b
 DIST kdebase-3.5-patchset-10.tar.bz2 38090 RMD160 b3fdca9c5220a213c1390ef558542640e810834a SHA1 a2a1a638bb6b7ac0b00d7588c53a1b60013cb3bb SHA256 73d3541312366a1aedf9ebe5187e565458224682ef188a20b735f7e54718e572
 DIST kdebase-3.5-patchset-13.tar.bz2 26504 RMD160 b723ba39de234131c3081be714d2919c5e5e38b5 SHA1 77d04b90d92ada8078263f2720f5e30d5ffdaa6e SHA256 78dc069a6d007d1dbf97147c368e7a4fda0dee5d41b15c471fde0589f0c377e0
 DIST kdebase-3.5.10.tar.bz2 24339704 RMD160 5845e94fbb8b5b64934d62dc9bd3b580d26d07bc SHA1 1a72e4170a0a953ed70c0693a034947d87b6efbd SHA256 77aa9d8f28c532f2e7a5157a7f4ba8df1001f00fa1cb72cb70b388b3d0e16b61
 DIST kdebase-3.5.9.tar.bz2 24239563 RMD160 2552d850e62efd044c178e2eb04efdcce90e4a33 SHA1 a6a19e0b26ed7a2b138a4a7594c8486e26610de8 SHA256 6e958803055928cda73273996696e5f7aaad803a3854853f4ec44428c49c831e
 DIST kdebase-runtime-4.2.2.tar.bz2 69327561 RMD160 773402d87c1cc179dfd33ffc7b5b91a1b657375b SHA1 0b100ceb77fa2e8cbe5303f7fea28b02117c7658 SHA256 2a119cbae51f4cb08ccde436be8d53e9005c46a011cd931fdd8306b34744fdf4
 DIST kdebase-runtime-4.2.3.tar.bz2 69329374 RMD160 87c75ca3078289c57e3e669e4284f9d06ee12143 SHA1 f3adc26e6b313a14af1e4208bc539017c8dcccd7 SHA256 82e4c82f16a8e93ddb6e91c2c3a0c8532e725037fa17622f291eee6a0a5749d7
-EBUILD kcontrol-3.5.10.ebuild 2368 RMD160 62a8f36202fe84aaedcbc810013d3a521233aa1a SHA1 bd1746a207bee12d1b830183fff37c92d5d4cbdc SHA256 cc5ac647b6334fe2eed6ede3eda3a873286538557fbdceed0775dedf140cefeb
+EBUILD kcontrol-3.5.10.ebuild 2414 RMD160 ebab8b6c9b7d92511aa353311f5e0682ded41f8d SHA1 70b84911eb80942a470293f6e559ce590748ee7d SHA256 449061e1c7051418ec46a2475fc66e447a164ab90edc42aec5094ae2a5273ba5
 EBUILD kcontrol-3.5.9.ebuild 2322 RMD160 24dc2467a51d3e633152d63f975e294cbde5a5d8 SHA1 f8164fcb9e40065ae2d9cce6d15231306c9026c6 SHA256 21dd99979fcc34b577243f43384cebd995fb42513fe1e0dbaabba5795200e34a
 EBUILD kcontrol-4.2.2.ebuild 542 RMD160 c6c8b2f8ab8157bfa3e23cb7d94449c80e9b2bec SHA1 17c99e315b6e52e83d4e696a67da947fa537554c SHA256 f27dd7bc126ed6ddfaf140323c699ef1f7ad5d486fdf8013a597f164556ff216
 EBUILD kcontrol-4.2.3.ebuild 545 RMD160 7ebabb22ed13ba680fcbc0fb96a0931118f1ad6c SHA1 b180d1d3b9d08eb2a31407367cf49efcf38cb704 SHA256 c5c821dada1f5bf867b2c97450b3bba09cdbfc02a70818d6bdc86ca2eb36b728
-MISC ChangeLog 19099 RMD160 adfc63ef7ddec8173dd4b9d4c9ecf9fce9ba4f14 SHA1 7ab3020c72f559f3d73884163a7ec7aa90955dab SHA256 8ec2a0f34ebf8d76269a08827556c1d83a685e2972c982574bd49f4e6ff51f68
+MISC ChangeLog 19270 RMD160 08247b825521f60da08b7905ec4e47336244091e SHA1 7137604e9f70a5bafe4e4dd2f347c4064e4a6cf8 SHA256 ea3d931dd750ceab9de3958f5caa6de95da4a3bb106982de09457f2956e8b613
 MISC metadata.xml 269 RMD160 f602efa0745239cc35c79e9679d50b35f3ec1510 SHA1 38032c3df683720d0bd35c92f64af895dd2a8118 SHA256 a812fdaed3ae6a6440ba969ced30cdef0c224c565d7a25bf3856844773ba6b66
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkohEgEACgkQjDdoMVfcAHh+aACgjp3C97DnzcCcc/q5w/AKdCTE
+5ZYAoN7qtMs0Yl/F7L4P/Q24z454/8yZ
+=yLvM
+-----END PGP SIGNATURE-----
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,
diff --git a/kde-base/kcontrol/kcontrol-3.5.10.ebuild b/kde-base/kcontrol/kcontrol-3.5.10.ebuild
index c75b978e5a2b..80fb05f45747 100644
--- a/kde-base/kcontrol/kcontrol-3.5.10.ebuild
+++ b/kde-base/kcontrol/kcontrol-3.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.10.ebuild,v 1.2 2009/05/16 09:03:05 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kcontrol/kcontrol-3.5.10.ebuild,v 1.3 2009/05/30 11:01:07 tampakrap Exp $
 
 KMNAME=kdebase
 EAPI="1"
@@ -49,6 +49,8 @@ KMCOPYLIB="libkonq libkonq
 	libtaskbar kicker/taskbar
 	libtaskmanager kicker/taskmanager"
 
+PATCHES=( "${FILESDIR}/${P}-gcc44.patch" )
+
 src_unpack() {
 	kde-meta_src_unpack unpack