Fix compilation with gcc-4. Add patch to fix compilation when LINGUAS

contains zh #114805
Package-Manager: portage-2.1_pre4-r1

5 files changed, 98 insertions, 5 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 4c3ae1c3de05..140b17a4a56f 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.134 2006/02/03 17:14:43 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.135 2006/02/22 13:52:51 agriffis Exp $
+
+  22 Feb 2006; Aron Griffis <agriffis@gentoo.org>
+  +files/gconf-1.0.9-gcc4.patch, +files/gconf-1.0.9-linguas.patch,
+  gconf-1.0.9.ebuild:
+  Fix compilation with gcc-4. Add patch to fix compilation when LINGUAS
+  contains zh #114805
 
   03 Feb 2006; Guy Martin <gmsoft@gentoo.org> gconf-2.12.1.ebuild:
   Stable on hppa.
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 362a98ed034f..8f34c58a0127 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,16 +1,64 @@
-MD5 5370eeef1202e7b0806b343aedadccbc ChangeLog 17419
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 7906672b171c81c2ca1640b7341baea6 ChangeLog 17655
+RMD160 0690fa930ef54c1af5b902aa01d9f04a6d3e4645 ChangeLog 17655
+SHA256 1689d39b6ef3f0a8fc5025ece65d5a15456ccb1891033c1730c523ee21a427e2 ChangeLog 17655
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
+RMD160 ebc699448e24dc5d252346644c502aba30a0271d files/digest-gconf-1.0.8-r3 64
+SHA256 d249e722900e836ce4b4c2d8d7e2e508a5e5694f7f377f1a84d5a7c339d60f5d files/digest-gconf-1.0.8-r3 64
 MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
+RMD160 ebc699448e24dc5d252346644c502aba30a0271d files/digest-gconf-1.0.8-r5 64
+SHA256 d249e722900e836ce4b4c2d8d7e2e508a5e5694f7f377f1a84d5a7c339d60f5d files/digest-gconf-1.0.8-r5 64
 MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
+RMD160 b8e6fa304eb164a42a5e2d075928a3dacd3d25ce files/digest-gconf-1.0.9 64
+SHA256 9de56074d71d10c3c8e24c18f7f7d09118c41b4a584820dceb5ffcf15654f028 files/digest-gconf-1.0.9 64
 MD5 117bfac59f5e93e340fe707b61bc5b53 files/digest-gconf-2.10.1-r1 66
+RMD160 fefad893f7cb361931a732ba93eade512183a8d0 files/digest-gconf-2.10.1-r1 66
+SHA256 7199365e31c7d4f443c407dc3ec7481dbfcaac147e49948115a89efee5163e2e files/digest-gconf-2.10.1-r1 66
 MD5 1dd5411bdbfdf13b035f9d03ef9858c1 files/digest-gconf-2.12.0 66
+RMD160 abee8154f2d3730d5733328906c8f413dece73d8 files/digest-gconf-2.12.0 66
+SHA256 3808cca079357dedbe943f8ca73fc2215629c25225970c36588904a6baadca19 files/digest-gconf-2.12.0 66
 MD5 32bee061b8d5bc7a5a41e3587f60f6ad files/digest-gconf-2.12.1 66
+RMD160 14b85da0b347b6b0d03864f75a6d401d57540d61 files/digest-gconf-2.12.1 66
+SHA256 97c7aab32b1dc3c13bec384d1795f84e47fcff9c62589a21d73a6d848e7a0ce1 files/digest-gconf-2.12.1 66
+MD5 a00775eca77339f117c1edd3ae41ed32 files/gconf-1.0.9-gcc4.patch 581
+RMD160 ee224b9ece8c06d41437eff7c86b799823aefe95 files/gconf-1.0.9-gcc4.patch 581
+SHA256 4e0a6cbc44d96c8a1dbd870b936f2beebc385856f8afd91cfb8084cd70d1320f files/gconf-1.0.9-gcc4.patch 581
+MD5 ea0fe5ad2e87dd94d776ce17c94e54c8 files/gconf-1.0.9-linguas.patch 591
+RMD160 682f64046fc5a72719315b8217aa21f5e8f05c74 files/gconf-1.0.9-linguas.patch 591
+SHA256 7179fe757fc47ca4022b4e6d6e411c28d4828b5749c13e4c18b04d63414a867d files/gconf-1.0.9-linguas.patch 591
 MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
+RMD160 5b9129acba9fbaef871830d0ff5378398d02393c files/gconf-1.0.9-locallock_mdk.patch 1202
+SHA256 98021a78c16f3f21a33c8705907cdfb485a11df1a4acddbd5dfbf40b0738ce23 files/gconf-1.0.9-locallock_mdk.patch 1202
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
+RMD160 126c30484309dc60a72b843697ab0feb352cde67 files/gconfd-2-fix.patch 1820
+SHA256 d311a969cfcfda29a1350c47b8a60068d4da37651a4485521b6889400ad584c4 files/gconfd-2-fix.patch 1820
 MD5 ac7cff50ecafeb03d9e4f489cbbf037f gconf-1.0.8-r3.ebuild 1707
+RMD160 6439ab897e3291f2ce0f3c86f0df261b905bd4aa gconf-1.0.8-r3.ebuild 1707
+SHA256 ea79f0a6bd36ecc3ab4aae6f1f7b5ae34ca3d77ae94293a0ea9fd4c53959a162 gconf-1.0.8-r3.ebuild 1707
 MD5 7998f0e3fab48622265a6b5277bf28ed gconf-1.0.8-r5.ebuild 1872
-MD5 a3295c560e968484fb4d35f2b3bb4d49 gconf-1.0.9.ebuild 1842
+RMD160 14e4f2c697467c2f3c6bb54fb3ed6878d034b136 gconf-1.0.8-r5.ebuild 1872
+SHA256 85422afbff95f9824be8a5c330992faa3c8740d05b370834aceba6d691f7f75e gconf-1.0.8-r5.ebuild 1872
+MD5 10fbd9fbbd20f86082b81b98f0709fbd gconf-1.0.9.ebuild 1917
+RMD160 1d0124f92720b8623a9494fbc6aba08f64b8cb4a gconf-1.0.9.ebuild 1917
+SHA256 572d1c3cafe41c2ea21f09be2580fbee4fa32fc08d9924d9d354ae57111416b2 gconf-1.0.9.ebuild 1917
 MD5 e9577b3216e9a2ab22f87bf5b234ca27 gconf-2.10.1-r1.ebuild 2015
+RMD160 79b07adb0ef584e8e95f822c4adae39e23b69d93 gconf-2.10.1-r1.ebuild 2015
+SHA256 e21d998847720e4cf15704461a404d9a6c23efd702496efe60bef9f1a2ad38ab gconf-2.10.1-r1.ebuild 2015
 MD5 9f586fcd2813a75ccd7da699616850b9 gconf-2.12.0.ebuild 2011
+RMD160 1ed07fff41d7f3515cb1e334afb56c1dfa6b7488 gconf-2.12.0.ebuild 2011
+SHA256 dc0aa11485424c5c7c59d12f49a73c8c7036a845361456f641aec755a3b36e03 gconf-2.12.0.ebuild 2011
 MD5 9053b30e0012779041c2157506b5cbbd gconf-2.12.1.ebuild 1970
+RMD160 13fd02954581488ed7ffe94b4c94d72bd936120e gconf-2.12.1.ebuild 1970
+SHA256 e83cdfe75cc53f0b8862b1e689c85c9f46f675fa1e156413ce2e2b0b36fe84dd gconf-2.12.1.ebuild 1970
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
+RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158
+SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 metadata.xml 158
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2.1 (GNU/Linux)
+
+iD8DBQFD/Gy9JrHF4yAQTrARAtLbAKCQr0iML/O5mT5yLRgRfPZGeoAQ/gCdHEEa
+bWx+by2Lbewi1f/2ZTSzUxk=
+=gD0F
+-----END PGP SIGNATURE-----
diff --git a/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch b/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch
new file mode 100644
index 000000000000..0d02cb359ef1
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-1.0.9-gcc4.patch
@@ -0,0 +1,23 @@
+These functions are declared external in a header file, then defined with
+static, the mismatch is an error with gcc4
+
+--- GConf-1.0.9/backends/bdb.c.agriffis	2006-02-21 08:55:42.000000000 -0500
++++ GConf-1.0.9/backends/bdb.c	2006-02-21 08:55:51.000000000 -0500
+@@ -331,7 +331,7 @@
+ 
+ /* } */
+ 
+-static guint32
++guint32
+ get_dir_id (BDB_Store * bdb, const char *dir)
+ {
+   int ret;
+@@ -405,7 +405,7 @@
+ 
+ /* { Functions to create directories and maintain the dir hierarchy */
+ 
+-static guint32
++guint32
+ get_or_create_dir (BDB_Store * bdb, const char *dir)
+ {
+   guint32 parent_id;
diff --git a/gnome-base/gconf/files/gconf-1.0.9-linguas.patch b/gnome-base/gconf/files/gconf-1.0.9-linguas.patch
new file mode 100644
index 000000000000..9f28a1dc613a
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-1.0.9-linguas.patch
@@ -0,0 +1,14 @@
+Fix bug 114805: gnome-base/gconf-1.0.9 fails to compile if LINGUAS contains zh
+
+diff -ruN GConf-1.0.9.orig/configure GConf-1.0.9/configure
+--- GConf-1.0.9.orig/configure	2005-12-07 14:50:19.000000000 -0800
++++ GConf-1.0.9/configure	2005-12-07 14:51:26.000000000 -0800
+@@ -10475,7 +10475,7 @@
+        NEW_LINGUAS=
+        for lang in ${LINGUAS=$ALL_LINGUAS}; do
+          case "$ALL_LINGUAS" in
+-          *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
++          $lang|*\ $lang|$lang\ *|*\ $lang\ *) NEW_LINGUAS="$NEW_LINGUAS $lang" ;;
+          esac
+        done
+        LINGUAS=$NEW_LINGUAS
diff --git a/gnome-base/gconf/gconf-1.0.9.ebuild b/gnome-base/gconf/gconf-1.0.9.ebuild
index 86ebe598fc6f..11ec48935c13 100644
--- a/gnome-base/gconf/gconf-1.0.9.ebuild
+++ b/gnome-base/gconf/gconf-1.0.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.9.ebuild,v 1.18 2005/07/09 15:58:38 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-1.0.9.ebuild,v 1.19 2006/02/22 13:52:51 agriffis Exp $
 
 inherit libtool gnome.org eutils gnuconfig
 
@@ -33,6 +33,8 @@ src_unpack() {
 	unpack ${A}
 	EPATCH_OPTS="-d ${S}" epatch ${FILESDIR}/gconfd-2-fix.patch
 	epatch ${FILESDIR}/${P}-locallock_mdk.patch
+	epatch ${FILESDIR}/${P}-gcc4.patch
+	epatch ${FILESDIR}/${P}-linguas.patch
 
 	mkdir ${S}/intl
 	touch ${S}/intl/libgettext.h