From: Kirtika Ruchandani <kirtibr@gmail.com>
Date: Fri, 29 May 2009 13:04:18 +0000 (+0530)
Subject: Added newer version of libosso-2.19 with patches from Mer and one patch from Maemo... 
X-Git-Url: http://vcs.maemo.org/git/?p=oespirit1;a=commitdiff_plain;h=17c426f7478d4cbe491a46c1be7545b455748017

Added newer version of libosso-2.19 with patches from Mer and one patch from Maemo bug 4594
---

diff --git a/libosso/mer-changes.patch b/libosso/mer-changes.patch
new file mode 100644
index 0000000..c421b69
--- /dev/null
+++ b/libosso/mer-changes.patch
@@ -0,0 +1,23 @@
+--- libosso-2.19-1.orig/debian/control
++++ libosso-2.19-1/debian/control
+@@ -6,7 +6,7 @@
+                libdbus-glib-1-dev (>= 0.61-osso18),
+                libglib2.0-dev,
+                doxygen,
+-               mce-dev
++               mce-dev, autoconf, automake, libtool
+ Standards-Version: 3.6.0
+ 
+ Package: libosso-dev
+--- libosso-2.19-1.orig/debian/changelog
++++ libosso-2.19-1/debian/changelog
+@@ -1,3 +1,9 @@
++libosso (2.19-1-mer1) jaunty; urgency=low
++
++  * Added autoconf, automake, libtool to build dependancies.
++
++ -- Carsten Munk <cvm@cs.au.dk>  Mon, 02 Mar 2009 14:54:31 +0000
++
+ libosso (2.19-1) unstable; urgency=low
+ 
+   * Removed auto-generated files and added autogen.sh run.
diff --git a/libosso/no-hidden.patch b/libosso/no-hidden.patch
new file mode 100644
index 0000000..f938a6d
--- /dev/null
+++ b/libosso/no-hidden.patch
@@ -0,0 +1,35 @@
+diff --git a/libosso-2.19.orig/src/osso-init.c b/libosso-2.19/src/osso-init.c
+index 9d9c624..90f621e 100644
+--- libosso-2.19/src/osso-init.c
++++ libosso-2.19/src/osso-init.c
+@@ -717,8 +717,11 @@ _msg_handler(DBusConnection *conn, DBusMessage *msg, void *data)
+     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ 
+-inline int __attribute__ ((visibility("hidden")))
+-muali_convert_msgtype(int t)
++/*inline int __attribute__ ((visibility("hidden")))*/
++/* 29/05/09 17:22:48  Kirtika B Ruchandani <kirtibr@gmail.com> 
++ * Attribute hidden breaks build at link stage 
++ */
++inline int muali_convert_msgtype(int t)
+ {
+     switch (t) {
+             case DBUS_MESSAGE_TYPE_METHOD_CALL:
+diff --git a/libosso-2.19.orig/src/osso-rpc.c b/libosso-2.19/src/osso-rpc.c
+index 9b1cde4..21aea9a 100644
+--- libosso-2.19/src/osso-rpc.c
++++ libosso-2.19/src/osso-rpc.c
+@@ -1026,7 +1026,10 @@ _muali_parse_id(const char *id, muali_bus_type *bus, char *sender,
+         *serial = atoi(buf);
+ }
+ 
+-inline void __attribute__ ((visibility("hidden")))
++/*inline void __attribute__ ((visibility("hidden")))*/
++/*29/05/09 17:25:57  Kirtika B Ruchandani <kirtibr@gmail.com> 
++ *Attribute hidden breaks build at link stage
++ */
+ _muali_make_id(muali_bus_type bus, const char *sender, int serial, char *id)
+ {
+         snprintf(id, MAX_MSGID_LEN, "%d,%s,%d", bus, sender, serial);
+
diff --git a/libosso_2.19.bb b/libosso_2.19.bb
new file mode 100644
index 0000000..404646f
--- /dev/null
+++ b/libosso_2.19.bb
@@ -0,0 +1,32 @@
+# Copyright (C) 2009 Kirtika B Ruchandani <kirtibr@gmail.com> 
+# Released under the MIT license (see COPYING.MIT for the terms)
+# NOTE: outo is now optional in libosso.
+# libosso builds without outo. TO-DO- add outo recipes
+
+DESCRIPTION = "Nokia OSSO IPC library"
+HOMEPAGE = "http://maemo.org"
+LICENSE = "GNU Lesser Public License-version 2.1"
+SECTION = "base"
+SECTION_${PN}-doc = "doc"
+SECTION_${PN}-dev = "devel"
+
+PR = "r1"
+
+
+require libosso.inc
+
+
+SRC_URI = " \
+            http://repository.maemo.org/pool/fremantle/free/libo/${PN}/${PN}_${PV}-1.tar.gz \
+            file://${PN}/no-hidden.patch;patch=1 \
+            file://${PN}/mer-changes.patch;patch=1 \
+          "
+
+# 28/05/09 18:51:21  FIXME No outo for now, so all these are senseless ATM
+PACKAGES += "${PN}-outo ${PN}-outo-dev ${PN}-outo-dbg ${PN}-outo-bin-dbg ${PN}-outo-bin"
+
+FILES_${PN}-outo = "${libdir}/outo/lib*.so"
+FILES_${PN}-outo-dev = "${libdir}/outo/*.la ${libdir}/outo/*.a"
+FILES_${PN}-outo-dbg = "${libdir}/outo/.debug/lib*.so"
+FILES_${PN}-outo-bin-dbg = "${libdir}/outo/.debug/*bin"
+FILES_${PN}-outo-bin = "${libdir}/outo/*bin ${libdir}/outo/mimedummy.doc"