[oe-commits] Gregoire Gentil : Signed-off-by: Khem Raj <raj.khem at gmail.com>

[GIT User account]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: 3e57b182e19ea69bb05f2622c3e367799d5d1c38
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=3e57b182e19ea69bb05f2622c3e367799d5d1c38

Author: Gregoire Gentil <gregoiregentil at gmail.com>
Date:   Sat Feb 14 15:41:13 2009 -0800

Signed-off-by: Khem Raj <raj.khem at gmail.com>

libosso_2.13.bb: Replace inline hidden attribute with static functions.

---

 .../maemo4/libosso/libosso-dont-use-inline.patch   |   47 ++++++++++++++++++++
 packages/maemo4/libosso_2.13.bb                    |    3 +-
 2 files changed, 49 insertions(+), 1 deletions(-)

diff --git a/packages/maemo4/libosso/libosso-dont-use-inline.patch b/packages/maemo4/libosso/libosso-dont-use-inline.patch
new file mode 100644
index 0000000..d387830
--- /dev/null
+++ b/packages/maemo4/libosso/libosso-dont-use-inline.patch
@@ -0,0 +1,47 @@
+--- libosso-2.13/src/osso-init.c.orig	2008-09-22 12:56:49.000000000 -0700
++++ libosso-2.13/src/osso-init.c	2008-09-22 12:57:22.000000000 -0700
+@@ -657,7 +657,8 @@
+     return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
+ }
+ 
+-inline int __attribute__ ((visibility("hidden")))
++//inline int __attribute__ ((visibility("hidden")))
++static int
+ muali_convert_msgtype(int t)
+ {
+     switch (t) {
+--- libosso-2.13/src/osso-internal.h.orig	2008-09-22 12:57:39.000000000 -0700
++++ libosso-2.13/src/osso-internal.h	2008-09-22 12:58:13.000000000 -0700
+@@ -209,7 +209,8 @@
+ #  define dprint(f, a...)
+ # endif /* LIBOSSO_DEBUG */
+ 
+-inline int __attribute__ ((visibility("hidden")))
++//inline int __attribute__ ((visibility("hidden")))
++static int
+ muali_convert_msgtype(int t);
+ 
+ muali_arg_t* _get_muali_args(DBusMessageIter *iter);
+@@ -297,7 +298,8 @@
+ _muali_parse_id(const char *id, muali_bus_type *bus, char *sender,
+                 int *serial);
+ 
+-inline void __attribute__ ((visibility("hidden")))
++//inline void __attribute__ ((visibility("hidden")))
++static void
+ _muali_make_id(muali_bus_type bus, const char *sender, int serial, char *id);
+ 
+ #endif /* OSSO_INTERNAL_H_ */
+--- libosso-2.13/src/osso-rpc.c.orig	2008-09-22 12:58:53.000000000 -0700
++++ libosso-2.13/src/osso-rpc.c	2008-09-22 12:59:42.000000000 -0700
+@@ -1026,7 +1026,8 @@
+         *serial = atoi(buf);
+ }
+ 
+-inline void __attribute__ ((visibility("hidden")))
++//inline void __attribute__ ((visibility("hidden")))
++static void
+ _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/packages/maemo4/libosso_2.13.bb b/packages/maemo4/libosso_2.13.bb
index 1920e29..25ee9aa 100644
--- a/packages/maemo4/libosso_2.13.bb
+++ b/packages/maemo4/libosso_2.13.bb
@@ -1,10 +1,11 @@
 require libosso.inc
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "\
   http://repository.maemo.org/pool/maemo4.0/free/source/libo/${PN}/${PN}_${PV}-1.1fix.tar.gz \
   file://libosso-buildfix.patch;patch=1 \
+  file://libosso-dont-use-inline.patch;patch=1 \
   "
 
 PACKAGES += "${PN}-outo ${PN}-outo-dev ${PN}-outo-dbg ${PN}-outo-bin-dbg ${PN}-outo-bin"