[oe-commits] Martin Jansa : frameworkd: sync with shr/merge version

[git version control]

Module: openembedded.git
Branch: martin_jansa/srcpv
Commit: 3bb244f39751e2c5e0531c49c2c88a58e11babd7
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3bb244f39751e2c5e0531c49c2c88a58e11babd7

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Sun Nov 15 19:18:00 2009 +0100

frameworkd: sync with shr/merge version

---

 .../frameworkd/oeventsd-use-opimd-signals.patch    |   27 ++++++++++++++++++++
 recipes/freesmartphone/frameworkd_git.bb           |   10 +++++--
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch
new file mode 100644
index 0000000..4dc5dd3
--- /dev/null
+++ b/recipes/freesmartphone/frameworkd/oeventsd-use-opimd-signals.patch
@@ -0,0 +1,27 @@
+--- a/framework/subsystems/oeventsd/fso_triggers.py	2009-07-12 13:44:53.000000000 +0200
++++ b/framework/subsystems/oeventsd/fso_triggers.py	2009-07-12 13:42:43.000000000 +0200
+@@ -197,8 +197,7 @@
+ class IncomingMessageTrigger(DBusTrigger):
+ #============================================================================#
+     """
+-    A custom dbus trigger for org.freesmartphone.GSM.SIM.IncomingStoredMessage
+-    TODO: change to opimd interface
++    A custom dbus trigger for org.freesmartphone.PIM.Messages.IncomingMessage
+     """
+ 
+     function_name = 'IncomingMessage'
+@@ -207,10 +206,10 @@
+         bus = dbus.SystemBus()
+         super(IncomingMessageTrigger, self).__init__(
+             bus,
+-            'org.freesmartphone.ogsmd',
+-            '/org/freesmartphone/GSM/Device',
+-            'org.freesmartphone.GSM.SIM',
+-            'IncomingStoredMessage'
++            'org.freesmartphone.opimd',
++            '/org/freesmartphone/PIM/Messages',
++            'org.freesmartphone.PIM.Messages',
++            'IncomingMessage'
+         )
+     def on_signal(self, index):
+         logger.info("Receive IncomingMessage on index = %s" % index)
diff --git a/recipes/freesmartphone/frameworkd_git.bb b/recipes/freesmartphone/frameworkd_git.bb
index d19bc91..9059c60 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -1,12 +1,12 @@
 DESCRIPTION = "The reference implementation of the freesmartphone.org framework APIs"
 HOMEPAGE = "http://www.freesmartphone.org"
-AUTHOR = "FreeSmartphone.Org Development Team"
+AUTHOR = "freesmartphone.org Development Team"
 SECTION = "console/network"
-DEPENDS = "python-cython-native python-pyrex-native"
+#DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.9.5.9+gitr${SRCPV}"
-PE = "1"
 PR = "r0"
+PE = "1"
 
 inherit distutils update-rc.d
 
@@ -17,6 +17,8 @@ SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master \
            file://frameworkd \
            file://frameworkd.conf \
 	   "
+SRC_URI_append_shr = "file://oeventsd-use-opimd-signals.patch;patch=1"
+
 S = "${WORKDIR}/git"
 
 do_configure_append() {
@@ -56,6 +58,8 @@ RDEPENDS_${PN} += "\
 RRECOMMENDS_${PN} += "\
   alsa-utils-amixer \
   python-gst \
+  python-phoneutils \
+  python-vobject \
   ppp \
 "