Included the c-locale patch see bug #72416, and removed the unpatched 2.8.1 version in favour of the new revision

5 files changed, 34 insertions, 2 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 3adfb3372c56..1be6827d7ebc 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.91 2004/11/24 16:46:59 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.92 2004/11/29 07:16:28 obz Exp $
+
+*gconf-2.8.1-r1 (29 Nov 2004)
+
+  29 Nov 2004; Mike Gardiner <obz@gentoo.org> +files/gconf-2-locale-c.patch,
+  +gconf-2.8.1-r1.ebuild, -gconf-2.8.1.ebuild:
+  Included the c-locale patch see bug #72416, and removed the unpatched 2.8.1
+  version in favour of the new revision
 
 *gconf-2.8.1 (25 Nov 2004)
 
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 5b533f2d2fa2..6f0fb991e5c0 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,4 +1,5 @@
 MD5 3fdee6893008ef16b07b0013411788e7 gconf-2.4.0.1.ebuild 1944
+MD5 47036feecb34386cb75297611c9e2eab gconf-2.8.1-r1.ebuild 2039
 MD5 a98553ecda0f10474c4c8e69409572eb gconf-1.0.8-r3.ebuild 1707
 MD5 403a06f672a0056d5e6afda5e8e7f59a gconf-2.6.1.ebuild 2110
 MD5 66df185efd44a40a10eb49af9973d764 gconf-1.0.9.ebuild 1867
@@ -9,10 +10,13 @@ MD5 eec87690b0de9465a18110f561381ad3 gconf-2.8.1.ebuild 1980
 MD5 3170285c6a0a0b4e83f8f987fc096786 ChangeLog 12466
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 a133b18a1f153018000805ea62e11b5e gconf-2.6.2.ebuild 1952
+MD5 6eca2795e82dea5a94c50c01ae0605bd .gconf-2.8.1-r1.ebuild.swp 12288
 MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
 MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
 MD5 00f3861e249d7220a7d0109b5d2c4e08 files/digest-gconf-2.8.0.1 67
+MD5 2d8f912a900d7e0525c34c4dd6eb3fc1 files/digest-gconf-2.8.1-r1 65
+MD5 4b4ec563282d7ee4b858b4f7e0eaf185 files/gconf-2-locale-settings.patch 1224
 MD5 faf030a14a8782cfd512c48b4b0d3297 files/digest-gconf-1.0.9 64
 MD5 cb328a03018fd32a8066856c5db76e13 files/digest-gconf-2.6.0 65
 MD5 069b5d67ce4b6a0bb68130fc9b156597 files/digest-gconf-2.6.1 65
diff --git a/gnome-base/gconf/files/digest-gconf-2.8.1 b/gnome-base/gconf/files/digest-gconf-2.8.1-r1
index 21df6c26f28c..21df6c26f28c 100644
--- a/gnome-base/gconf/files/digest-gconf-2.8.1
+++ b/gnome-base/gconf/files/digest-gconf-2.8.1-r1
diff --git a/gnome-base/gconf/files/gconf-2-locale-c.patch b/gnome-base/gconf/files/gconf-2-locale-c.patch
new file mode 100644
index 000000000000..920af97d9c85
--- /dev/null
+++ b/gnome-base/gconf/files/gconf-2-locale-c.patch
@@ -0,0 +1,12 @@
+diff -ur GConf-2.8.1/backends/markup-tree.c GConf-2.8.1-patched/backends/markup-tree.c
+--- GConf-2.8.1/backends/markup-tree.c	2004-08-26 05:12:42.000000000 +0800
++++ GConf-2.8.1-patched/backends/markup-tree.c	2004-11-29 15:07:31.829661696 +0800
+@@ -1502,7 +1502,7 @@
+             }
+ 
+           /* Quit as soon as we have the best possible locale */
+-          if (local_schemas[0] != NULL)
++	  if (local_schemas[0] != NULL && c_local_schema != NULL)
+             break;
+ 
+           tmp = tmp->next;
diff --git a/gnome-base/gconf/gconf-2.8.1.ebuild b/gnome-base/gconf/gconf-2.8.1-r1.ebuild
index 0909c77e0883..f74cfd0ba2fa 100644
--- a/gnome-base/gconf/gconf-2.8.1.ebuild
+++ b/gnome-base/gconf/gconf-2.8.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.8.1.ebuild,v 1.1 2004/11/24 16:46:59 obz Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.8.1-r1.ebuild,v 1.1 2004/11/29 07:16:28 obz Exp $
 
 inherit eutils gnome2
 
@@ -32,6 +32,15 @@ DEPEND="${RDEPEND}
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+	# Apply the patch for gconf/locale settings, see bug #72416
+	epatch ${FILESDIR}/gconf-2-locale-c.patch
+
+}
+
 src_install() {
 
 	gnome2_src_install