libosso 2.13: Fixed build

  - updated libosso-dont-use-inline.patch to really make some
    formerly hidden functions visible

2 files changed, 36 insertions, 17 deletions

diff --git a/recipes/maemo4/libosso/libosso-dont-use-inline.patch b/recipes/maemo4/libosso/libosso-dont-use-inline.patch
index d3878308c2..f8e6ca4a1c 100644
--- a/recipes/maemo4/libosso/libosso-dont-use-inline.patch
+++ b/recipes/maemo4/libosso/libosso-dont-use-inline.patch
@@ -1,47 +1,66 @@
---- 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
+Index: libosso-2.13/src/osso-init.c
+===================================================================
+--- libosso-2.13.orig/src/osso-init.c	2007-09-21 12:53:31.000000000 +0200
++++ libosso-2.13/src/osso-init.c	2009-03-19 23:14:11.000000000 +0100
 @@ -657,7 +657,8 @@
      return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
  }
  
 -inline int __attribute__ ((visibility("hidden")))
-+//inline int __attribute__ ((visibility("hidden")))
-+static int
++/*inline int __attribute__ ((visibility("hidden")))*/
++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
+Index: libosso-2.13/src/osso-internal.h
+===================================================================
+--- libosso-2.13.orig/src/osso-internal.h	2007-09-21 12:53:31.000000000 +0200
++++ libosso-2.13/src/osso-internal.h	2009-03-19 23:13:23.000000000 +0100
 @@ -209,7 +209,8 @@
  #  define dprint(f, a...)
  # endif /* LIBOSSO_DEBUG */
  
 -inline int __attribute__ ((visibility("hidden")))
-+//inline int __attribute__ ((visibility("hidden")))
-+static int
++/*inline int __attribute__ ((visibility("hidden")))*/
++int
  muali_convert_msgtype(int t);
  
  muali_arg_t* _get_muali_args(DBusMessageIter *iter);
-@@ -297,7 +298,8 @@
+@@ -293,11 +294,12 @@
+ 
+ void _close_all_plugins(osso_context_t *osso);
+ 
+-inline void __attribute__ ((visibility("hidden")))
++/*inline void __attribute__ ((visibility("hidden")))*/
  _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
++/*inline void __attribute__ ((visibility("hidden")))*/
++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
+Index: libosso-2.13/src/osso-rpc.c
+===================================================================
+--- libosso-2.13.orig/src/osso-rpc.c	2009-03-19 23:09:32.000000000 +0100
++++ libosso-2.13/src/osso-rpc.c	2009-03-19 23:13:03.000000000 +0100
+@@ -992,7 +992,7 @@
+  * muali = maemo user application library
+  ******************************************************/
+ 
+-inline void __attribute__ ((visibility("hidden")))
++/*inline void __attribute__ ((visibility("hidden")))*/
+ _muali_parse_id(const char *id, muali_bus_type *bus, char *sender,
+                 int *serial)
+ {
 @@ -1026,7 +1026,8 @@
          *serial = atoi(buf);
  }
  
 -inline void __attribute__ ((visibility("hidden")))
-+//inline void __attribute__ ((visibility("hidden")))
-+static void
++/*inline void __attribute__ ((visibility("hidden")))*/
++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/recipes/maemo4/libosso_2.13.bb b/recipes/maemo4/libosso_2.13.bb
index 25ee9aac15..478fa78896 100644
--- a/recipes/maemo4/libosso_2.13.bb
+++ b/recipes/maemo4/libosso_2.13.bb
@@ -1,6 +1,6 @@
 require libosso.inc
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI = "\
   http://repository.maemo.org/pool/maemo4.0/free/source/libo/${PN}/${PN}_${PV}-1.1fix.tar.gz \