diff options
| author | Spenser Gilliland <spenser@gillilanding.com> | 2013-06-07 13:18:46 +0000 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2013-06-08 21:57:46 +0200 |
| commit | 1232fe4d22e15a31385c69f02570f036b738b6b2 (patch) | |
| tree | 809bf1bec785cf0fe2ce352b501651e67a177667 /package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch | |
| parent | 0b8ed5b53d066f86f09e01d02a5e0bd715c17b70 (diff) | |
| download | buildroot-novena-1232fe4d22e15a31385c69f02570f036b738b6b2.tar.gz buildroot-novena-1232fe4d22e15a31385c69f02570f036b738b6b2.zip | |
libglib2: Bump libglib2 to 2.36.1
This patch bumps libglib2 to version 2.36.1. In addition this bumps glibmm
and glib-networking to 2.36.1.
Signed-off-by: Spenser Gilliland <spenser at gillilanding.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
Diffstat (limited to 'package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch')
| -rw-r--r-- | package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch | 18 |
1 files changed, 10 insertions, 8 deletions
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 index 55635446a..43c7e1609 100644 --- a/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch +++ b/package/libglib2/libglib2-0004-fix-build-when-no-thread-support.patch @@ -1,27 +1,29 @@ Fix gio/gcancellable.c build when thread support is disabled +Changes: + Updated for 2.36.1 + Signed-off-by: "Samuel Martin" <s.martin49@gmail.com> +Signed-off-by: "Spenser Gilliland" <spenser@gillilanding.com> --- ---- a/gio/gcancellable.c 2013-05-14 23:08:25.514461348 +0200 -+++ b/gio/gcancellable.c 2013-05-14 23:10:23.347789625 +0200 -@@ -270,8 +270,10 @@ g_cancellable_reset (GCancellable *cance +--- 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, - g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable))); + g_cond_wait (&cancellable_cond, &cancellable_mutex); +#endif } if (priv->cancelled) -@@ -619,8 +621,10 @@ g_cancellable_disconnect (GCancellable +@@ -620,7 +622,9 @@ while (priv->cancelled_running) { priv->cancelled_running_waiting = TRUE; +#if defined(G_THREADS_ENABLED) - g_cond_wait (cancellable_cond, - g_static_mutex_get_mutex (& G_LOCK_NAME (cancellable))); + g_cond_wait (&cancellable_cond, &cancellable_mutex); +#endif } |