diff options
Diffstat (limited to 'recipes/maemo4/libosso')
| -rw-r--r-- | recipes/maemo4/libosso/libosso-buildfix.patch | 64 | ||||
| -rw-r--r-- | recipes/maemo4/libosso/libosso-dont-use-inline.patch | 47 |
2 files changed, 111 insertions, 0 deletions
diff --git a/recipes/maemo4/libosso/libosso-buildfix.patch b/recipes/maemo4/libosso/libosso-buildfix.patch new file mode 100644 index 0000000000..adb0ca6b5f --- /dev/null +++ b/recipes/maemo4/libosso/libosso-buildfix.patch @@ -0,0 +1,64 @@ +Index: libosso-2.13/src/osso-hw.c +=================================================================== +--- libosso-2.13.orig/src/osso-hw.c 2008-02-13 12:55:17.000000000 +0100 ++++ libosso-2.13/src/osso-hw.c 2008-02-13 13:02:55.000000000 +0100 +@@ -23,6 +23,9 @@ + * 02110-1301 USA + */ + ++#define _GNU_SOURCE ++#include <string.h> ++ + #include "osso-internal.h" + #include "osso-hw.h" + #include "osso-mem.h" +@@ -635,7 +638,7 @@ + (*cb)((muali_context_t*)osso, &info, data->user_data); + + if (info.args != NULL) { +- free(info.args); ++ free((void *) info.args); + info.args = NULL; + } + } +@@ -762,7 +765,7 @@ + (*cb)((muali_context_t*)osso, &info, data->user_data); + + if (info.args != NULL) { +- free(info.args); ++ free((void *) info.args); + info.args = NULL; + } + } +Index: libosso-2.13/src/osso-rpc.c +=================================================================== +--- libosso-2.13.orig/src/osso-rpc.c 2008-02-13 13:03:13.000000000 +0100 ++++ libosso-2.13/src/osso-rpc.c 2008-02-13 13:06:05.000000000 +0100 +@@ -997,7 +997,8 @@ + int *serial) + { + int i; +- char buf[20], *p; ++ char buf[20]; ++ const char *p; + + /* get bus type */ + for (i = 0, p = id; *p != ','; ++p, ++i) { +@@ -1101,7 +1102,7 @@ + (*cb)((muali_context_t*)osso, &info, cb_data->user_data); + + if (info.args != NULL) { +- free(info.args); ++ free((void *) info.args); + info.args = NULL; + } + } +@@ -1410,7 +1411,7 @@ + cb_data->message_id = (long)msg_serial; + + cb_data->user_cb = reply_handler; +- cb_data->user_data = user_data; ++ cb_data->user_data = (void *) user_data; + cb_data->match_rule = NULL; + cb_data->event_type = 0; + cb_data->bus_type = bus_type; diff --git a/recipes/maemo4/libosso/libosso-dont-use-inline.patch b/recipes/maemo4/libosso/libosso-dont-use-inline.patch new file mode 100644 index 0000000000..d3878308c2 --- /dev/null +++ b/recipes/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); + |