summaryrefslogtreecommitdiffstats
path: root/meta/packages
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-02-07 14:27:08 +0000
committerRoss Burton <ross@openedhand.com>2008-02-07 14:27:08 +0000
commit950e91291562946b276ef7725ddf3df216e6fb3c (patch)
tree1fc40582f850aeeca5ad7b748138f0657e50ef07 /meta/packages
parent7fcc99585962e5e8dcf34ce0e62ef447218b26b0 (diff)
downloadpoky-950e91291562946b276ef7725ddf3df216e6fb3c.tar.gz
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
Diffstat (limited to 'meta/packages')
-rw-r--r--meta/packages/gnome/gconf-dbus/notify-fix.patch13
-rw-r--r--meta/packages/gnome/gconf-dbus_svn.bb4
2 files changed, 1 insertions, 16 deletions
diff --git a/meta/packages/gnome/gconf-dbus/notify-fix.patch b/meta/packages/gnome/gconf-dbus/notify-fix.patch
deleted file mode 100644
index 278b64acc6..0000000000
--- a/meta/packages/gnome/gconf-dbus/notify-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
1Index: gconf/gconf-dbus.c
2===================================================================
3--- gconf/gconf-dbus.c (revision 635)
4+++ gconf/gconf-dbus.c (working copy)
5@@ -45,7 +45,7 @@
6 #define DAEMON_NAME_OWNER_CHANGED_RULE \
7 "type='signal',member='NameOwnerChanged',arg0='org.gnome.GConf'"
8 #define NOTIFY_RULE \
9- "type='method_call',interface='org.gnome.GConf.Database'"
10+ "type='method_call',interface='org.gnome.GConf.Database',member='Notify'"
11 #define DAEMON_DISCONNECTED_RULE \
12 "type='signal',member='Disconnected'"
13
diff --git a/meta/packages/gnome/gconf-dbus_svn.bb b/meta/packages/gnome/gconf-dbus_svn.bb
index dc9062c0e6..4e587295f6 100644
--- a/meta/packages/gnome/gconf-dbus_svn.bb
+++ b/meta/packages/gnome/gconf-dbus_svn.bb
@@ -7,10 +7,8 @@ RPROVIDES_${PN} = "gconf"
7RPROVIDES_${PN}-dev = "gconf-dev" 7RPROVIDES_${PN}-dev = "gconf-dev"
8 8
9PV = "2.16.0+svnr${SRCREV}" 9PV = "2.16.0+svnr${SRCREV}"
10PR = "r5"
11 10
12SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http \ 11SRC_URI = "svn://developer.imendio.com/svn/gconf-dbus;module=trunk;proto=http"
13 file://notify-fix.patch;patch=1;pnum=0"
14 12
15inherit pkgconfig autotools 13inherit pkgconfig autotools
16S = "${WORKDIR}/trunk" 14S = "${WORKDIR}/trunk"