From 4131611c19d3e7d72e9a79aacd614c2734d9ed8e Mon Sep 17 00:00:00 2001 From: Dongxiao Xu Date: Wed, 20 Apr 2011 13:45:02 +0800 Subject: glib-2.0: upgrade to version 2.28.6 Signed-off-by: Dongxiao Xu --- .../glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch | 2 ++ meta/recipes-core/glib-2.0/glib-2.0/configure-libtool.patch | 2 ++ meta/recipes-core/glib-2.0/glib-2.0/g_once_init_enter.patch | 2 ++ meta/recipes-core/glib-2.0/glib-2.0/glib-gettextize-dir.patch | 2 ++ 4 files changed, 8 insertions(+) (limited to 'meta/recipes-core/glib-2.0/glib-2.0') 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 8195bd492..b65a47462 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 Added to poky by Kevin Tian , 06/25/2010 Rebased for glib-2.27.3 by Dongxiao Xu , 11/16/2010 +Upstream-Status: Inappropriate [patches for test code] + diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-test.c --- glib-2.27.3-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 +++ 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 7c170be60..c21e37849 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 @@ # from PATH though # Rebased to glib-2.27.3 by Dongxiao Xu +Upstream-Status: Inappropriate [configuration] + diff -ruN glib-2.27.3-orig/configure.ac glib-2.27.3/configure.ac --- glib-2.27.3-orig/configure.ac 2010-11-03 11:02:05.000000000 +0800 +++ 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 a2a506c2a..2eaa19b60 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 Signed-off-by: Darren Hart +Upstream-Status: Pending + Index: glib-2.27.5/glib/gthread.h =================================================================== --- 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 e54a8e510..ee435111f 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 @@ # by Kevin Tian , 06/25/2010 # Rebased by Dongxiao Xu , 11/16/2010 +Upstream-Status: Inappropriate [configuration] + diff -ruN glib-2.27.3-orig/glib-gettextize.in glib-2.27.3/glib-gettextize.in --- glib-2.27.3-orig/glib-gettextize.in 2009-04-01 07:04:20.000000000 +0800 +++ glib-2.27.3/glib-gettextize.in 2010-11-16 12:55:06.874605916 +0800 -- cgit v1.2.3