Patch gconf-dbus to build with glib 2.10 (don't define G_DISABLE_DEPRECATED)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@365 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 13 insertions, 1 deletions

diff --git a/openembedded/packages/gnome/gconf-dbus/no-deprecation.patch b/openembedded/packages/gnome/gconf-dbus/no-deprecation.patch
new file mode 100644
index 0000000000..133ea550ee
--- /dev/null
+++ b/openembedded/packages/gnome/gconf-dbus/no-deprecation.patch
@@ -0,0 +1,11 @@
+--- trunk/examples/basic-gconf-app.c.old        2006-04-25 20:39:48.000000000 +0100
++++ trunk/examples/basic-gconf-app.c    2006-04-25 20:40:11.000000000 +0100
+@@ -80,7 +80,7 @@
+ 
+  /* Be clean and pure */
+ #define GTK_DISABLE_DEPRECATED
+-#define G_DISABLE_DEPRECATED
++/*#define G_DISABLE_DEPRECATED*/
+ 
+ #include <gconf/gconf-client.h>
+ #include <gtk/gtk.h>
diff --git a/openembedded/packages/gnome/gconf-dbus_svn.bb b/openembedded/packages/gnome/gconf-dbus_svn.bb
index d6b79494be..28abec2763 100644
--- a/openembedded/packages/gnome/gconf-dbus_svn.bb
+++ b/openembedded/packages/gnome/gconf-dbus_svn.bb
@@ -8,11 +8,12 @@ RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "0.0+svn${SRCDATE}"
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
            file://gconf-dbus-update.patch;patch=1;pnum=0 \
            file://xml-backend-locks-compile-fix.patch;patch=1 \
+           file://no-deprecation.patch;patch=1 \
            file://xml-backend-oldxml-Makefile.patch \
            file://69gconfd-dbus"