From patchwork Wed Sep 26 12:49:01 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v2] glib-2.0: Update to 2.34.0 Date: Wed, 26 Sep 2012 12:49:01 -0000 From: Phil Blundell X-Patchwork-Id: 37279 Message-Id: <1348663741.31293.114.camel@phil-desktop> To: openembedded-core Signed-off-by: Phil Blundell --- v2: now with correct SRC_URI checksums .../60_wait-longer-for-threads-to-die.patch | 11 ------- meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34 +++++++++++--------- .../{glib-2.0_2.32.4.bb => glib-2.0_2.34.0.bb} | 6 ++-- 3 files changed, 21 insertions(+), 30 deletions(-) rename meta/recipes-core/glib-2.0/{glib-2.0_2.32.4.bb => glib-2.0_2.34.0.bb} (90%) 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 4ff7b80..67dfeca 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 @@ -7,17 +7,6 @@ Upstream-Status: Inappropriate [patches for test code] diff -ruN glib-2.30.0-orig/tests/threadpool-test.c glib-2.30.0/tests/threadpool-test.c --- glib-2.30.0-orig/tests/threadpool-test.c 2009-04-01 07:04:21.000000000 +0800 +++ glib-2.30.0/tests/threadpool-test.c 2010-11-16 12:28:09.002172678 +0800 -@@ -5,8 +5,8 @@ - - #include - --#define DEBUG_MSG(x) --/* #define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); */ -+/* #define DEBUG_MSG(x) */ -+#define DEBUG_MSG(args) g_printerr args ; g_printerr ("\n"); - - #define WAIT 5 /* seconds */ - #define MAX_THREADS 10 @@ -130,10 +130,10 @@ test_count_threads () == 0) break; diff --git a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch index 1e65643..f5b8384 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch +++ b/meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch @@ -5,21 +5,23 @@ Upstream-Status: Inappropriate [configuration] RP 2012/2/25 -Index: glib-2.30.2/configure.ac -=================================================================== ---- glib-2.30.2.orig/configure.ac 2012-02-25 14:50:07.444242397 +0000 -+++ glib-2.30.2/configure.ac 2012-02-25 14:51:28.096240485 +0000 -@@ -3769,10 +3769,9 @@ - # Check for libdbus1 - Optional - is only used in the GDBus test cases +--- glib-2.34.0/configure.ac~ 2012-09-25 12:06:14.383311239 +0100 ++++ glib-2.34.0/configure.ac 2012-09-25 12:07:28.584958144 +0100 +@@ -3500,10 +3500,13 @@ # # 1.2.14 required for dbus_message_set_serial --PKG_CHECK_MODULES(DBUS1, -- dbus-1 >= 1.2.14, -- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes], -- have_dbus1=no) -+DBUS1_CFLAGS= -+DBUS1_LIBS= -+$have_dbus1=no - AC_SUBST(DBUS1_CFLAGS) - AC_SUBST(DBUS1_LIBS) - AM_CONDITIONAL(HAVE_DBUS1, [test "x$have_dbus1" = "xyes"]) + AS_IF([ test x$enable_modular_tests = xyes], [ +- PKG_CHECK_MODULES(DBUS1, +- dbus-1 >= 1.2.14, +- [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes], +- have_dbus1=no) ++# PKG_CHECK_MODULES(DBUS1, ++# dbus-1 >= 1.2.14, ++# [AC_DEFINE(HAVE_DBUS1, 1, [Define if dbus-1 is available]) have_dbus1=yes], ++# have_dbus1=no) ++ DBUS1_CFLAGS= ++ DBUS1_LIBS= ++ have_dbus1=no + AC_SUBST(DBUS1_CFLAGS) + AC_SUBST(DBUS1_LIBS) + ]) diff --git a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb b/meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb similarity index 90% rename from meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb rename to meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb index 10c0b61..85d093e 100644 --- a/meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb +++ b/meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb @@ -1,6 +1,6 @@ require glib.inc -PR = "r6" +PR = "r0" PE = "1" DEPENDS += "libffi python-argparse-native zlib" @@ -16,8 +16,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ file://nodbus.patch \ file://nolibelf.patch \ " -SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a" -SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2" +SRC_URI[md5sum] = "d80aef668f981b5dcf157633d13081c0" +SRC_URI[sha256sum] = "f69b112f8848be35139d9099b62bc81649241f78f6a775516f0d4c9b47f65144" SRC_URI_append_virtclass-native = " file://glib-gettextize-dir.patch" BBCLASSEXTEND = "native nativesdk"