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/60_wait-longer-for-threads-to-die.patch | 2 ++ .../glib-2.0/glib-2.0/configure-libtool.patch | 2 ++ .../glib-2.0/glib-2.0/g_once_init_enter.patch | 2 ++ .../glib-2.0/glib-2.0/glib-gettextize-dir.patch | 2 ++ meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb | 16 ---------------- meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb | 16 ++++++++++++++++ meta/recipes-core/glib-2.0/glib.inc | 2 +- 7 files changed, 25 insertions(+), 17 deletions(-) delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb (limited to 'meta') 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 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 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 @@ # 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 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 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 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 @@ # 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 diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb deleted file mode 100644 index 6a1fb6ca7f..0000000000 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.26.1.bb +++ /dev/null @@ -1,16 +0,0 @@ -require glib.inc - -PE = "1" -PR = "r0" - -SRC_URI = "${GNOME_MIRROR}/glib/2.26/glib-${PV}.tar.bz2 \ - file://configure-libtool.patch \ - file://60_wait-longer-for-threads-to-die.patch \ - file://g_once_init_enter.patch \ - " - -SRC_URI[md5sum] = "17535accceef55bcb17a74d73f9c2aef" -SRC_URI[sha256sum] = "7a74ff12b6b9dee1f2d0e520b56b68b621920c4f4250bdf23468e515625c28d5" - -SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" -BBCLASSEXTEND = "native" diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb new file mode 100644 index 0000000000..6b6c1f5ab0 --- /dev/null +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.28.6.bb @@ -0,0 +1,16 @@ +require glib.inc + +PE = "1" +PR = "r0" + +SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \ + file://configure-libtool.patch \ + file://60_wait-longer-for-threads-to-die.patch \ + file://g_once_init_enter.patch \ + " + +SRC_URI[md5sum] = "7d8fc15ae70d5111c0cf2a79d50ef717" +SRC_URI[sha256sum] = "557fb7c39d21b9359fbac51fd6b0b883bc97a2561c0166eef993a4078312f578" + +SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" +BBCLASSEXTEND = "native" diff --git a/meta/recipes-core/glib-2.0/glib.inc b/meta/recipes-core/glib-2.0/glib.inc index 5ebff68a6f..9b6e17bbf9 100644 --- a/meta/recipes-core/glib-2.0/glib.inc +++ b/meta/recipes-core/glib-2.0/glib.inc @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gmodule/COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ file://gmodule/gmodule.h;startline=4;endline=17;md5=76ab161b37202cd004073c42fac276ed \ file://glib/pcre/COPYING;md5=266ebc3ff74ee9ce6fad65577667c0f4 \ - file://glib/pcre/pcre.h;startline=11;endline=35;md5=cc0858840d3c312ec3e45b28077eb0d8 \ + file://glib/pcre/pcre.h;startline=11;endline=35;md5=ce867cf87ebbd2bb55e980d90328390d \ file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" BUGTRACKER = "http://bugzilla.gnome.org" SECTION = "libs" -- cgit v1.2.3