frameworkd: add patch for shr, merge from shr/merge

3 files changed, 62 insertions, 11 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 0000000000..4dc5dd3a84
--- /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 130fe55231..926fcf60a8 100644
--- a/recipes/freesmartphone/frameworkd_git.bb
+++ b/recipes/freesmartphone/frameworkd_git.bb
@@ -16,6 +16,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() {
@@ -55,6 +57,8 @@ RDEPENDS_${PN} += "\
 RRECOMMENDS_${PN} += "\
   alsa-utils-amixer \
   python-gst \
+  python-phoneutils \
+  python-vobject \
   ppp \
 "
 
diff --git a/recipes/freesmartphone/opimd-utils_git.bb b/recipes/freesmartphone/opimd-utils_git.bb
index 5031ae5c13..68038f34c1 100644
--- a/recipes/freesmartphone/opimd-utils_git.bb
+++ b/recipes/freesmartphone/opimd-utils_git.bb
@@ -1,27 +1,47 @@
 DESCRIPTION = "Test scripts for freesmartphone.org opimd interface"
 HOMEPAGE = "http://freesmartphone.org"
+SHR_RELEASE ?= "shr"
 LICENSE ?= "GPL"
+RDEPENDS = "python-elementary python-dbus python-codecs python-shell python python-core python-edbus frameworkd"
 SECTION = "x11/application"
 PV = "0.0.2+gitr${SRCREV}"
 PR = "r0"
 
 inherit setuptools
 
-SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http"
-S = "${WORKDIR}/git"
+PACKAGES =+ "\
+  ${PN}-cli \
+  ${PN}-notes \
+  ${PN}-data \
+"
 
-RDEPENDS = "\
-  python-elementary \
-  python-edbus \
-  python-codecs \
-  python-shell \
-  \
+RDEPENDS_${PN} = "\
+  ${PN}-data \
   shr-settings \
-  shr-theme \
-  frameworkd \
   pyphonelog \
+  shr-theme \
+"
+
+RDEPENDS_${PN}-notes = "\
+  ${PN}-data \
+"
+
+RRECOMMENDS_${PN} = "\
+  ${PN}-notes \
+  ${PN}-cli \
 "
 
+PACKAGE_ARCH_${PN}-cli = "all"
+PACKAGE_ARCH_${PN}-data = "all"
+PACKAGE_ARCH_${PN}-notes = "all"
+
+SRC_URI = "git://git.shr-project.org/repo/opimd-utils.git;protocol=http"
+S = "${WORKDIR}/git"
 FILES_${PN} += "${sysconfdir}/X11/Xsession.d/89opimd-notifier"
 FILES_${PN} += "${prefix}/share/applications/"
-FILES_${PN} += "${prefix}/share/pixmaps/opimd-utils/"
+FILES_${PN} += "${prefix}/share/pixmaps/"
+FILES_${PN}-data += "${prefix}/share/pixmaps/opimd-utils/"
+FILES_${PN}-cli += "${prefix}/bin/opimd-cli"
+FILES_${PN}-notes += "${prefix}/bin/opimd-notes"
+FILES_${PN}-notes += "${prefix}/share/pixmaps/opimd-notes.png"
+FILES_${PN}-notes += "${prefix}/share/applications/opimd-notes.desktop"