summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Lord <chris@openedhand.com>2006-04-25 19:13:11 +0000
committerChris Lord <chris@openedhand.com>2006-04-25 19:13:11 +0000
commit78cf831612de872a81fbe05fb26474c5a0dee886 (patch)
tree52cb5062570b4c225d99e824633222a80a91f9f6
parente1256b9d3a53d27817873fa6d6636a6aabd342a3 (diff)
downloadopenembedded-core-78cf831612de872a81fbe05fb26474c5a0dee886.tar.gz
openembedded-core-78cf831612de872a81fbe05fb26474c5a0dee886.tar.bz2
openembedded-core-78cf831612de872a81fbe05fb26474c5a0dee886.tar.xz
openembedded-core-78cf831612de872a81fbe05fb26474c5a0dee886.zip
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
-rw-r--r--openembedded/packages/gnome/gconf-dbus/no-deprecation.patch11
-rw-r--r--openembedded/packages/gnome/gconf-dbus_svn.bb3
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 000000000..133ea550e
--- /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 d6b79494b..28abec276 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"