gconf-dbus: update srvrev and remove merged patches

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

diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index c22b7b9b1cd126983367c9b1c7afcbb35e4760aa..93e777bc17cbc5d9712e744848829450f71b0d76 100644 (file)
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -73,7 +73,7 @@ PREFERRED_PROVIDER_matchbox-panel ?= "matchbox-panel-2"
 #
 # Source dates or revisions to use:
 #
-SRCREV_pn-gconf-dbus ?= "625"
+SRCREV_pn-gconf-dbus ?= "638"
 SRCREV_pn-gtkhtml2 ?= "1144"
 SRCREV_pn-web ?= "97"
 SRCREV_pn-web-webkit ?= "102"

diff --git a/meta/packages/gnome/gconf-dbus/notify-fix.patch b/meta/packages/gnome/gconf-dbus/notify-fix.patch
deleted file mode 100644 (file)
index 278b64a..0000000
--- a/meta/packages/gnome/gconf-dbus/notify-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: gconf/gconf-dbus.c
-===================================================================
---- gconf/gconf-dbus.c (revision 635)
-+++ gconf/gconf-dbus.c (working copy)
-@@ -45,7 +45,7 @@
- #define DAEMON_NAME_OWNER_CHANGED_RULE \
-     "type='signal',member='NameOwnerChanged',arg0='org.gnome.GConf'"
- #define NOTIFY_RULE \
--    "type='method_call',interface='org.gnome.GConf.Database'"
-+    "type='method_call',interface='org.gnome.GConf.Database',member='Notify'"
- #define DAEMON_DISCONNECTED_RULE \
-     "type='signal',member='Disconnected'"
- 

diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb
index dc9062c0e6c55f8f8e2d8029c55b9ad3a7b051de..4e587295f64adcebbba06ae0fcb40a949e03f94e 100644 (file)
--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -7,10 +7,8 @@ RPROVIDES_${PN} = "gconf"
 RPROVIDES_${PN}-dev = "gconf-dev"
 
 PV = "2.16.0+svnr${SRCREV}"
-PR = "r5"
 
-SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \
-        file://notify-fix.patch;patch=1;pnum=0"
+SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
 
 inherit pkgconfig autotools 
 S = "${WORKDIR}/trunk"