From f8634af6912fe1bdc408ffa99c9c175b0f9156ab Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 9 Jun 2013 12:22:27 +0200 Subject: libglib2: renumber patches Signed-off-by: Thomas Petazzoni Signed-off-by: Peter Korsgaard --- package/libglib2/libglib2-0001-optional-ipv6.patch | 53 ++++++++++++++++++++++ ...ib2-0002-fix-build-when-no-thread-support.patch | 30 ++++++++++++ ...ib2-0004-fix-build-when-no-thread-support.patch | 30 ------------ package/libglib2/libglib2-optional-ipv6.patch | 53 ---------------------- 4 files changed, 83 insertions(+), 83 deletions(-) create mode 100644 package/libglib2/libglib2-0001-optional-ipv6.patch create mode 100644 package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch delete mode 100644 package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch delete mode 100644 package/libglib2/libglib2-optional-ipv6.patch diff --git a/package/libglib2/libglib2-0001-optional-ipv6.patch b/package/libglib2/libglib2-0001-optional-ipv6.patch new file mode 100644 index 000000000..8e7b418a0 --- /dev/null +++ b/package/libglib2/libglib2-0001-optional-ipv6.patch @@ -0,0 +1,53 @@ +[PATCH]: fix build on uClibc without IPv6 support + +Signed-off-by: Peter Korsgaard +--- + gio/ginetaddress.c | 9 +++++++++ + 1 file changed, 9 insertions(+) + +Index: glib-2.26.0/gio/ginetaddress.c +=================================================================== +--- glib-2.26.0.orig/gio/ginetaddress.c ++++ glib-2.26.0/gio/ginetaddress.c +@@ -21,6 +21,7 @@ + * Samuel Cormier-Iijima + */ + ++#include + #include + + #include +@@ -434,7 +435,11 @@ + return NULL; + } + ++#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__) ++#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET) ++#else + #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6) ++#endif + + /** + * g_inet_address_new_from_bytes: +@@ -483,8 +488,10 @@ + + return g_inet_address_new_from_bytes (addr, family); + } ++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)) + else + return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); ++#endif + } + + /** +@@ -510,8 +517,10 @@ + + return g_inet_address_new_from_bytes (addr, family); + } ++#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)) + else + return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); ++#endif + } + + diff --git a/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch b/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch new file mode 100644 index 000000000..43c7e1609 --- /dev/null +++ b/package/libglib2/libglib2-0002-fix-build-when-no-thread-support.patch @@ -0,0 +1,30 @@ +Fix gio/gcancellable.c build when thread support is disabled + +Changes: + Updated for 2.36.1 + +Signed-off-by: "Samuel Martin" +Signed-off-by: "Spenser Gilliland" +--- +--- libglib2-2.36.1.orig/gio/gcancellable.c 2013-03-13 08:39:09.000000000 -0500 ++++ libglib2-2.36.1/gio/gcancellable.c 2013-05-26 10:49:32.366019891 -0500 +@@ -267,7 +267,9 @@ + while (priv->cancelled_running) + { + priv->cancelled_running_waiting = TRUE; ++#if defined(G_THREADS_ENABLED) + g_cond_wait (&cancellable_cond, &cancellable_mutex); ++#endif + } + + if (priv->cancelled) +@@ -620,7 +622,9 @@ + while (priv->cancelled_running) + { + priv->cancelled_running_waiting = TRUE; ++#if defined(G_THREADS_ENABLED) + g_cond_wait (&cancellable_cond, &cancellable_mutex); ++#endif + } + + g_signal_handler_disconnect (cancellable, handler_id); diff --git a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch b/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch deleted file mode 100644 index 43c7e1609..000000000 --- a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch +++ /dev/null @@ -1,30 +0,0 @@ -Fix gio/gcancellable.c build when thread support is disabled - -Changes: - Updated for 2.36.1 - -Signed-off-by: "Samuel Martin" -Signed-off-by: "Spenser Gilliland" ---- ---- libglib2-2.36.1.orig/gio/gcancellable.c 2013-03-13 08:39:09.000000000 -0500 -+++ libglib2-2.36.1/gio/gcancellable.c 2013-05-26 10:49:32.366019891 -0500 -@@ -267,7 +267,9 @@ - while (priv->cancelled_running) - { - priv->cancelled_running_waiting = TRUE; -+#if defined(G_THREADS_ENABLED) - g_cond_wait (&cancellable_cond, &cancellable_mutex); -+#endif - } - - if (priv->cancelled) -@@ -620,7 +622,9 @@ - while (priv->cancelled_running) - { - priv->cancelled_running_waiting = TRUE; -+#if defined(G_THREADS_ENABLED) - g_cond_wait (&cancellable_cond, &cancellable_mutex); -+#endif - } - - g_signal_handler_disconnect (cancellable, handler_id); diff --git a/package/libglib2/libglib2-optional-ipv6.patch b/package/libglib2/libglib2-optional-ipv6.patch deleted file mode 100644 index 8e7b418a0..000000000 --- a/package/libglib2/libglib2-optional-ipv6.patch +++ /dev/null @@ -1,53 +0,0 @@ -[PATCH]: fix build on uClibc without IPv6 support - -Signed-off-by: Peter Korsgaard ---- - gio/ginetaddress.c | 9 +++++++++ - 1 file changed, 9 insertions(+) - -Index: glib-2.26.0/gio/ginetaddress.c -=================================================================== ---- glib-2.26.0.orig/gio/ginetaddress.c -+++ glib-2.26.0/gio/ginetaddress.c -@@ -21,6 +21,7 @@ - * Samuel Cormier-Iijima - */ - -+#include - #include - - #include -@@ -434,7 +435,11 @@ - return NULL; - } - -+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__) -+#define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET) -+#else - #define G_INET_ADDRESS_FAMILY_IS_VALID(family) ((family) == AF_INET || (family) == AF_INET6) -+#endif - - /** - * g_inet_address_new_from_bytes: -@@ -483,8 +488,10 @@ - - return g_inet_address_new_from_bytes (addr, family); - } -+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)) - else - return g_inet_address_new_from_bytes (in6addr_loopback.s6_addr, family); -+#endif - } - - /** -@@ -510,8 +517,10 @@ - - return g_inet_address_new_from_bytes (addr, family); - } -+#if !(defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)) - else - return g_inet_address_new_from_bytes (in6addr_any.s6_addr, family); -+#endif - } - - -- cgit v1.2.3