diff options
Diffstat (limited to 'meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch')
| -rw-r--r-- | meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch | 51 |
1 files changed, 22 insertions, 29 deletions
diff --git a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch index 78b073c..1ede7a4 100644 --- a/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch +++ b/meta-ivi/recipes-core-ivi/dbus/dbus/capi-dbus-add-support-for-custom-marshalling.patch @@ -13,11 +13,10 @@ Subject: [PATCH] Add functions to support querying and manipulating the dbus/dbus-string.h | 5 +++ 4 files changed, 134 insertions(+) -diff --git a/dbus/dbus-message.c b/dbus/dbus-message.c -index 43cb1be..d34663a 100644 ---- a/dbus/dbus-message.c -+++ b/dbus/dbus-message.c -@@ -3445,6 +3445,47 @@ dbus_message_get_sender (DBusMessage *message) +diff -urN dbus-1.10.6.orig/dbus/dbus-message.c dbus-1.10.6/dbus/dbus-message.c +--- dbus-1.10.6.orig/dbus/dbus-message.c 2016-06-30 15:42:08.307273745 +0900 ++++ dbus-1.10.6/dbus/dbus-message.c 2016-06-30 15:42:38.939272838 +0900 +@@ -3558,6 +3558,47 @@ } /** @@ -65,7 +64,7 @@ index 43cb1be..d34663a 100644 * Gets the type signature of the message, i.e. the arguments in the * message payload. The signature includes only "in" arguments for * #DBUS_MESSAGE_TYPE_METHOD_CALL and only "out" arguments for -@@ -4632,6 +4673,64 @@ dbus_message_type_to_string (int type) +@@ -4742,6 +4783,64 @@ } /** @@ -130,11 +129,10 @@ index 43cb1be..d34663a 100644 * Turn a DBusMessage into the marshalled form as described in the D-Bus * specification. * -diff --git a/dbus/dbus-message.h b/dbus/dbus-message.h -index 4fd44da..76377b8 100644 ---- a/dbus/dbus-message.h -+++ b/dbus/dbus-message.h -@@ -138,6 +138,9 @@ dbus_bool_t dbus_message_set_sender (DBusMessage *message, +diff -urN dbus-1.10.6.orig/dbus/dbus-message.h dbus-1.10.6/dbus/dbus-message.h +--- dbus-1.10.6.orig/dbus/dbus-message.h 2016-06-30 15:42:08.307273745 +0900 ++++ dbus-1.10.6/dbus/dbus-message.h 2016-06-30 15:42:38.939272838 +0900 +@@ -138,6 +138,9 @@ DBUS_EXPORT const char* dbus_message_get_sender (DBusMessage *message); DBUS_EXPORT @@ -144,7 +142,7 @@ index 4fd44da..76377b8 100644 const char* dbus_message_get_signature (DBusMessage *message); DBUS_EXPORT void dbus_message_set_no_reply (DBusMessage *message, -@@ -262,6 +265,17 @@ dbus_bool_t dbus_message_iter_close_container (DBusMessageIter *iter, +@@ -265,6 +268,17 @@ DBUS_EXPORT void dbus_message_iter_abandon_container (DBusMessageIter *iter, DBusMessageIter *sub); @@ -162,11 +160,10 @@ index 4fd44da..76377b8 100644 DBUS_EXPORT void dbus_message_lock (DBusMessage *message); -diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c -index 0f63612..a084eca 100644 ---- a/dbus/dbus-string.c -+++ b/dbus/dbus-string.c -@@ -730,6 +730,22 @@ _dbus_string_get_length (const DBusString *str) +diff -urN dbus-1.10.6.orig/dbus/dbus-string.c dbus-1.10.6/dbus/dbus-string.c +--- dbus-1.10.6.orig/dbus/dbus-string.c 2016-06-30 15:42:08.307273745 +0900 ++++ dbus-1.10.6/dbus/dbus-string.c 2016-06-30 15:42:38.939272838 +0900 +@@ -744,6 +744,22 @@ } #endif /* !_dbus_string_get_length */ @@ -189,11 +186,10 @@ index 0f63612..a084eca 100644 /** * Makes a string longer by the given number of bytes. Checks whether * adding additional_length to the current length would overflow an -diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h -index 86fb8c3..bfa2a39 100644 ---- a/dbus/dbus-string.h -+++ b/dbus/dbus-string.h -@@ -61,6 +61,7 @@ struct DBusString +diff -urN dbus-1.10.6.orig/dbus/dbus-string.h dbus-1.10.6/dbus/dbus-string.h +--- dbus-1.10.6.orig/dbus/dbus-string.h 2016-06-30 15:42:08.307273745 +0900 ++++ dbus-1.10.6/dbus/dbus-string.h 2016-06-30 15:43:01.027272184 +0900 +@@ -61,6 +61,7 @@ */ #define _dbus_string_get_data(s) ((char*)(((DBusString*)(s))->dummy1)) #define _dbus_string_get_length(s) (((DBusString*)(s))->dummy2) @@ -201,7 +197,7 @@ index 86fb8c3..bfa2a39 100644 #define _dbus_string_set_byte(s, i, b) ((((unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) = (unsigned char) (b)) #define _dbus_string_get_byte(s, i) (((const unsigned char*)(((DBusString*)(s))->dummy1))[(i)]) #define _dbus_string_get_const_data(s) ((const char*)(((DBusString*)(s))->dummy1)) -@@ -131,6 +132,10 @@ void _dbus_string_copy_to_buffer_with_nul (const DBusString *str, +@@ -151,6 +152,10 @@ int _dbus_string_get_length (const DBusString *str); #endif /* !_dbus_string_get_length */ @@ -209,9 +205,6 @@ index 86fb8c3..bfa2a39 100644 +int _dbus_string_get_allocated (const DBusString *str); +#endif /* !_dbus_string_get_allocated */ + - dbus_bool_t _dbus_string_lengthen (DBusString *str, - int additional_length); - void _dbus_string_shorten (DBusString *str, --- -1.9.1 - + /** + * Get the string's length as an unsigned integer, for comparison with + * size_t and similar unsigned types that does not trigger compiler |