[oe-commits] Angus Ainslie : frameworkd : no need for dbuscache patch anymore

[GIT User account]

Module: openembedded.git
Branch: fso/milestone5.5
Commit: 9dec9decc5c2d42a881d1dd927ae1cc27a4394e5
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9dec9decc5c2d42a881d1dd927ae1cc27a4394e5

Author: Angus Ainslie <nytowl at openmoko.org>
Date:   Mon May 18 08:53:01 2009 -0600

frameworkd : no need for dbuscache patch anymore

---

 recipes/freesmartphone/frameworkd/dbuscache.diff |   11 -----------
 recipes/freesmartphone/frameworkd_git.bb         |    3 +--
 2 files changed, 1 insertions(+), 13 deletions(-)

diff --git a/recipes/freesmartphone/frameworkd/dbuscache.diff b/recipes/freesmartphone/frameworkd/dbuscache.diff
deleted file mode 100644
index a62b2bf..0000000
--- a/recipes/freesmartphone/frameworkd/dbuscache.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- git/framework/patterns/dbuscache.py.orig	2009-05-08 08:44:12.000000000 -0600
-+++ git/framework/patterns/dbuscache.py	2009-05-08 08:44:46.000000000 -0600
-@@ -30,7 +30,7 @@
-         try:
-             obj = _objects[ ( service, object ) ]
-         except KeyError:
--            obj = _objects[ ( service, object ) ] = _bus.get_object( service, object, introspect=False, follow_name_owner_changes=False )
-+            obj = _objects[ ( service, object ) ] = _bus.get_object( service, object, introspect=False, follow_name_owner_changes=True )
-         iface = _ifaces[ ( service, object, interface ) ] = dbus.Interface( obj, interface )
- 
-     return iface
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index 72a34e6..42fb2d1 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -5,7 +5,7 @@ SECTION = "console/network"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.5.1+gitr${SRCPV}"
-PR = "r3"
+PR = "r4"
 
 inherit distutils update-rc.d
 
@@ -15,7 +15,6 @@ INITSCRIPT_PARAMS = "defaults 29"
 SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
            file://frameworkd \
            file://frameworkd.conf \
-	   file://dbuscache.diff;patch=0 \
 	   "
 S = "${WORKDIR}/git"