diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2011-09-30 17:33:03 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-14 13:18:07 +0100 |
commit | da0798420ea1b98bd383e4bad7f748bfaa96f18b (patch) | |
tree | f1770e7c02d5ec02685994dd7c497f370c80e67a /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | 263852e5a27ca2256ff11d72c0c80e963bdbee0a (diff) | |
download | poky-da0798420ea1b98bd383e4bad7f748bfaa96f18b.tar.gz |
glib: upgrade to 2.30.0
(From OE-Core rev: 74f43e3b269c01dba7cd5215a8e825229bd5ecff)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
5 files changed, 65 insertions, 67 deletions
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch deleted file mode 100644 index 5c0afbce71..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Sat, 18 Jun 2011 23:51:35 +0200 | ||
4 | Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch | ||
5 | |||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
9 | --- | ||
10 | glib/gatomic.h | 2 +- | ||
11 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/glib/gatomic.h b/glib/gatomic.h | ||
14 | index ddd39b8..b758142 100644 | ||
15 | --- a/glib/gatomic.h | ||
16 | +++ b/glib/gatomic.h | ||
17 | @@ -70,7 +70,7 @@ void g_atomic_pointer_set (volatile gpointer G_GNUC_MAY_ALI | ||
18 | (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval))) | ||
19 | # define g_atomic_pointer_get(atomic) \ | ||
20 | ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \ | ||
21 | - (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic))) | ||
22 | + (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic))) | ||
23 | # define g_atomic_pointer_set(atomic, newval) \ | ||
24 | ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \ | ||
25 | (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval))) | ||
26 | -- | ||
27 | 1.6.6.1 | ||
28 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch deleted file mode 100644 index db9a7993b2..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001 | ||
2 | From: Koen Kooi <koen@dominion.thruhere.net> | ||
3 | Date: Sat, 18 Jun 2011 23:52:17 +0200 | ||
4 | Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang | ||
5 | |||
6 | Upstream-Status: Inappropriate [configuration] | ||
7 | |||
8 | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> | ||
9 | --- | ||
10 | gobject/glib-mkenums.in | 2 +- | ||
11 | 1 files changed, 1 insertions(+), 1 deletions(-) | ||
12 | |||
13 | diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in | ||
14 | index 6372245..b486fe9 100755 | ||
15 | --- a/gobject/glib-mkenums.in | ||
16 | +++ b/gobject/glib-mkenums.in | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -#! @PERL_PATH@ | ||
19 | +#! /usr/bin/env perl | ||
20 | |||
21 | use warnings; | ||
22 | use File::Basename; | ||
23 | -- | ||
24 | 1.6.6.1 | ||
25 | |||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch index b65a47462a..4ff7b80075 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch | |||
@@ -4,9 +4,9 @@ Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 | |||
4 | 4 | ||
5 | Upstream-Status: Inappropriate [patches for test code] | 5 | Upstream-Status: Inappropriate [patches for test code] |
6 | 6 | ||
7 | diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c | 7 | diff -ruN glib-2.30.0-orig/tests/threadpool-test.c glib-2.30.0/tests/threadpool-test.c |
8 | --- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 | 8 | --- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 |
9 | +++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 | 9 | +++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 |
10 | @@ -5,8 +5,8 @@ | 10 | @@ -5,8 +5,8 @@ |
11 | 11 | ||
12 | #include <glib.h> | 12 | #include <glib.h> |
@@ -18,16 +18,16 @@ diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool- | |||
18 | 18 | ||
19 | #define WAIT 5 /* seconds */ | 19 | #define WAIT 5 /* seconds */ |
20 | #define MAX_THREADS 10 | 20 | #define MAX_THREADS 10 |
21 | @@ -124,10 +124,10 @@ | 21 | @@ -130,10 +130,10 @@ |
22 | DEBUG_MSG (("[unused] stopping unused threads")); | 22 | test_count_threads () == 0) |
23 | g_thread_pool_stop_unused_threads (); | 23 | break; |
24 | 24 | ||
25 | - DEBUG_MSG (("[unused] waiting ONE second for threads to die")); | 25 | - DEBUG_MSG (("[unused] waiting ONE second for threads to die")); |
26 | + DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); | 26 | + DEBUG_MSG (("[unused] waiting FIVE second for threads to die")); |
27 | 27 | ||
28 | /* Some time for threads to die. */ | 28 | /* Some time for threads to die. */ |
29 | - g_usleep (G_USEC_PER_SEC); | 29 | - g_usleep (G_USEC_PER_SEC); |
30 | + g_usleep (5 * G_USEC_PER_SEC); | 30 | + g_usleep (5 * G_USEC_PER_SEC); |
31 | } | ||
31 | 32 | ||
32 | DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", | 33 | DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist", |
33 | g_thread_pool_get_num_unused_threads (), | ||
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch b/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch index a1001922be..cca57d4f78 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/no-iconv.patch | |||
@@ -6,8 +6,6 @@ impact on case when they are available. | |||
6 | 6 | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
8 | 8 | ||
9 | Upstream-Status: Inappropriate [embedded specific] | ||
10 | |||
11 | 9 | ||
12 | Index: glib-2.26.1/glib/gconvert.c | 10 | Index: glib-2.26.1/glib/gconvert.c |
13 | =================================================================== | 11 | =================================================================== |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch b/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch new file mode 100644 index 0000000000..5c0a07abb1 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch | |||
@@ -0,0 +1,53 @@ | |||
1 | while cross compiling we cannot execute run tests | ||
2 | |||
3 | Upstream-Status: Inappropriate [configuration] | ||
4 | |||
5 | --- glib-2.30.0.orig/configure.ac 2011-09-29 16:57:35.000000000 +0200 | ||
6 | +++ glib-2.30.0/configure.ac 2011-09-29 17:00:19.931493488 +0200 | ||
7 | @@ -586,45 +586,7 @@ | ||
8 | dnl until we have checked this function is actually usable | ||
9 | AC_CHECK_FUNC([qsort_r]) | ||
10 | |||
11 | -# BSD has a qsort_r with wrong argument order | ||
12 | -if test x$ac_cv_func_qsort_r = xyes ; then | ||
13 | - AC_CACHE_CHECK([if qsort_r uses glibc compatible argument order], glib_cv_have_qsort_r, [ | ||
14 | - AC_RUN_IFELSE([AC_LANG_SOURCE([[ | ||
15 | - #define _GNU_SOURCE | ||
16 | - #include <stdlib.h> | ||
17 | - | ||
18 | - static int | ||
19 | - cmp (const void *a, const void *b, void *c) | ||
20 | - { | ||
21 | - const int *ia = a; | ||
22 | - const int *ib = b; | ||
23 | - | ||
24 | - if (*ia < *ib) | ||
25 | - return -1; | ||
26 | - else if (*ia > *ib) | ||
27 | - return 1; | ||
28 | - else | ||
29 | - return 0; | ||
30 | - } | ||
31 | - | ||
32 | - int | ||
33 | - main (int argc, char **argv) | ||
34 | - { | ||
35 | - int arr[3] = { 1, 2, 0 }; | ||
36 | - int d = 3; | ||
37 | - | ||
38 | - qsort_r (arr, 3, sizeof (int), cmp, &d); | ||
39 | - | ||
40 | - if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2) | ||
41 | - return 0; | ||
42 | - else | ||
43 | - return 1; | ||
44 | - }]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])]) | ||
45 | -fi | ||
46 | - | ||
47 | -if test x$glib_cv_have_qsort_r = xyes ; then | ||
48 | - AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function]) | ||
49 | -fi | ||
50 | +AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function]) | ||
51 | |||
52 | AC_CHECK_SIZEOF(char) | ||
53 | AC_CHECK_SIZEOF(short) | ||