Patch that resolves C syntax problems. Closes bug #48670.

5 files changed, 42 insertions, 24 deletions

diff --git a/gnome-base/gconf/ChangeLog b/gnome-base/gconf/ChangeLog
index 9d3670add727..56f2485db200 100644
--- a/gnome-base/gconf/ChangeLog
+++ b/gnome-base/gconf/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for gnome-base/gconf
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.64 2004/03/31 07:53:03 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/ChangeLog,v 1.65 2004/04/22 20:25:19 leonardop Exp $
+
+  22 Apr 2004; L. Boshell <leonardop@gentoo.org> gconf-2.6.1.ebuild,
+  files/GConf-2.6.1-gcc2_fix.patch:
+  Added patch to remove syntax problems, causing compilation to fail under
+  gcc-2. Resolves bug #48670, thanks to Tristan Henderson.
+
+*gconf-2.6.1 (20 Apr 2004)
+
+  20 Apr 2004; foser <foser@gentoo.org> gconf-2.6.1.ebuild :
+  Version bump.
 
   31 Mar 2004; L. Boshell <leonardop@gentoo.org> gconf-2.4.0.1.ebuild:
   Added DEPEND entry for =app-text/docbook-sgml-dtd-3.0* if the `doc' USE
diff --git a/gnome-base/gconf/Manifest b/gnome-base/gconf/Manifest
index 9b30941e32e5..15b947d8a62a 100644
--- a/gnome-base/gconf/Manifest
+++ b/gnome-base/gconf/Manifest
@@ -1,17 +1,17 @@
-MD5 c96ae1a59f1b59a643cfdf37731622be gconf-2.4.0.1.ebuild 1975
+MD5 967ae70117646190f5eebd11b345e6c7 ChangeLog 9663
 MD5 696456ccbfeb02d8ac0dfde24a72ef03 gconf-1.0.8-r3.ebuild 1716
-MD5 168334b675d9291416f3d5e2addc77a3 gconf-2.6.1.ebuild 1994
 MD5 4cd81e0e163c70b1f59f4a2dbead5539 gconf-1.0.9.ebuild 1859
-MD5 c70b6c845b8e01c6a6719a1760ee4e4f gconf-1.0.8-r5.ebuild 1874
+MD5 6ddffc8e585fe42acf3827cb8918c8e5 gconf-2.6.1.ebuild 2133
 MD5 4875c7f5fb19e6e82650d7b44cc4e4e6 gconf-2.6.0.ebuild 1994
-MD5 5b542ec512d17f455594a7e8535c1162 ChangeLog 9317
+MD5 c70b6c845b8e01c6a6719a1760ee4e4f gconf-1.0.8-r5.ebuild 1874
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
+MD5 c96ae1a59f1b59a643cfdf37731622be gconf-2.4.0.1.ebuild 1975
+MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
+MD5 069b5d67ce4b6a0bb68130fc9b156597 files/digest-gconf-2.6.1 65
+MD5 cb328a03018fd32a8066856c5db76e13 files/digest-gconf-2.6.0 65
+MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
 MD5 8485bd44122f283d1549e1f1cdddd03f files/gconfd-2-fix.patch 1820
 MD5 8fa2949970b3612b9e06ce82dcd4b68a files/digest-gconf-2.4.0.1 67
 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
-MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r3 64
-MD5 e36bf98a90603eebfcc4d3dacd5fa785 files/digest-gconf-1.0.8-r5 64
-MD5 52e623180b7b8b7336ca4c1977432da9 files/gconf-2.2.1-stdio.patch 361
+MD5 aaa79f3ad5c910cfa6f813112e66f79e files/gconf-1.0.9-locallock_mdk.patch 1202
+MD5 4452461d5fcfd96e2d95e62712554c71 files/GConf-2.6.1-gcc2_fix.patch 420
diff --git a/gnome-base/gconf/files/GConf-2.6.1-gcc2_fix.patch b/gnome-base/gconf/files/GConf-2.6.1-gcc2_fix.patch
new file mode 100644
index 000000000000..ce8f5b78866d
--- /dev/null
+++ b/gnome-base/gconf/files/GConf-2.6.1-gcc2_fix.patch
@@ -0,0 +1,11 @@
+diff -NurdB GConf-2.6.1-orig/gconf/gconf-internals.c GConf-2.6.1/gconf/gconf-internals.c
+--- GConf-2.6.1-orig/gconf/gconf-internals.c	2004-04-22 14:47:51.000000000 -0500
++++ GConf-2.6.1/gconf/gconf-internals.c	2004-04-22 14:49:30.000000000 -0500
+@@ -2839,7 +2839,6 @@
+                        GError  **error)
+ {
+   ConfigServer server = CORBA_OBJECT_NIL;
+-;
+   int p[2] = { -1, -1 };
+   char buf[1];
+   GError *tmp_err;
diff --git a/gnome-base/gconf/files/gconf-2.2.1-stdio.patch b/gnome-base/gconf/files/gconf-2.2.1-stdio.patch
deleted file mode 100644
index 9e72b0b6e4ff..000000000000
--- a/gnome-base/gconf/files/gconf-2.2.1-stdio.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -NurB GConf-2.2.1-orig/backends/markup-tree.c GConf-2.2.1/backends/markup-tree.c
---- GConf-2.2.1-orig/backends/markup-tree.c	2003-11-12 22:13:09.000000000 -0500
-+++ GConf-2.2.1/backends/markup-tree.c	2003-11-12 22:14:09.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <dirent.h>
- #include <limits.h>
- #include <time.h>
-+#include <stdio.h>
- 
- typedef struct
- {
diff --git a/gnome-base/gconf/gconf-2.6.1.ebuild b/gnome-base/gconf/gconf-2.6.1.ebuild
index ecee0fc46243..a39a4e8504a2 100644
--- a/gnome-base/gconf/gconf-2.6.1.ebuild
+++ b/gnome-base/gconf/gconf-2.6.1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.1.ebuild,v 1.1 2004/04/20 23:10:23 foser Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gconf/gconf-2.6.1.ebuild,v 1.2 2004/04/22 20:25:19 leonardop Exp $
 
-inherit gnome2
+inherit eutils gnome2
 
 MY_PN=GConf
 MY_P=${MY_PN}-${PV}
@@ -32,6 +32,14 @@ DEPEND="${RDEPEND}
 
 MAKEOPTS="${MAKEOPTS} -j1"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Remove invalid C syntax. See bug #48670.
+	epatch ${FILESDIR}/${MY_P}-gcc2_fix.patch
+}
+
 src_install() {
 
 	gnome2_src_install