diff options
author | Dongxiao Xu <dongxiao.xu@intel.com> | 2011-04-20 13:45:02 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-04-28 10:44:30 +0100 |
commit | 6d3de3f168ef39e19a6da21a40b1ce74b7d416c1 (patch) | |
tree | 347c60af36520092c63dbdf7b878b41356ac757b /meta/recipes-core/glib-2.0/glib-2.0 | |
parent | 60cf46671e9b812578dd2f3997961cf6fb3bb748 (diff) | |
download | poky-6d3de3f168ef39e19a6da21a40b1ce74b7d416c1.tar.gz |
glib-2.0: upgrade to version 2.28.6
(From OE-Core rev: 4131611c19d3e7d72e9a79aacd614c2734d9ed8e)
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glib-2.0/glib-2.0')
4 files changed, 8 insertions, 0 deletions
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 8195bd4922..b65a47462a 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 | |||
@@ -2,6 +2,8 @@ copy from OE, said to borrow from Ubuntu. Not in glib-2.0 upstream yet. Add for | |||
2 | Added to poky by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 | 2 | Added to poky by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 |
3 | Rebased for glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 | 3 | 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] | ||
6 | |||
5 | diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c | 7 | diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c |
6 | --- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 | 8 | --- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 |
7 | +++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 | 9 | +++ glib-2.27.3/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch index 7c170be60f..c21e378491 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | |||
@@ -4,6 +4,8 @@ | |||
4 | # from PATH though | 4 | # from PATH though |
5 | # Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> | 5 | # Rebased to glib-2.27.3 by Dongxiao Xu <dongxiao.xu@intel.com> |
6 | 6 | ||
7 | Upstream-Status: Inappropriate [configuration] | ||
8 | |||
7 | diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac | 9 | diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac |
8 | --- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 | 10 | --- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 |
9 | +++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 | 11 | +++ glib-2.27.3/configure.ac 2010-11-16 12:38:12.610485990 +0800 |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch b/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch index a2a506c2ad..2eaa19b604 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch | |||
@@ -7,6 +7,8 @@ http://www.mail-archive.com/openembedded-devel@lists.openembedded.org/msg005 | |||
7 | 7 | ||
8 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> | 8 | Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
9 | 9 | ||
10 | Upstream-Status: Pending | ||
11 | |||
10 | Index: glib-2.27.5/glib/gthread.h | 12 | Index: glib-2.27.5/glib/gthread.h |
11 | =================================================================== | 13 | =================================================================== |
12 | --- glib-2.27.5.orig/glib/gthread.h | 14 | --- glib-2.27.5.orig/glib/gthread.h |
diff --git a/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch b/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch index e54a8e5106..ee435111fc 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch | |||
@@ -8,6 +8,8 @@ | |||
8 | # by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 | 8 | # by Kevin Tian <kevin.tian@intel.com>, 06/25/2010 |
9 | # Rebased by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 | 9 | # Rebased by Dongxiao Xu <dongxiao.xu@intel.com>, 11/16/2010 |
10 | 10 | ||
11 | Upstream-Status: Inappropriate [configuration] | ||
12 | |||
11 | diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in | 13 | diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in |
12 | --- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800 | 14 | --- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800 |
13 | +++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800 | 15 | +++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800 |