[meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release

* [meta-oe][meta-efl][PATCH 01/15] glib-2.0: upgrade from 2.29.3+git to 2.30.0 release
  2011-09-30 12:56 [meta-oe][meta-efl][PATCH 00/15] Pull request #23 Martin Jansa
@ 2011-09-30 12:56 ` Martin Jansa
  2011-09-30 15:51   ` Martin Jansa
  2011-09-30 12:56 ` [meta-oe][meta-efl][PATCH 02/15] xorg-driver: use renamed .inc from oe-core Martin Jansa
                   ` (14 subsequent siblings)
  15 siblings, 1 reply; 46+ messages in thread
From: Martin Jansa @ 2011-09-30 12:56 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 ...003-gatomic-proper-pointer-get-cast.patch.patch |   28 -------
 .../0005-glib-mkenums-interpreter.patch.patch      |   25 -------
 .../60_wait-longer-for-threads-to-die.patch        |   24 +++---
 .../glib-2.0/remove.test.for.qsort_r.patch         |   77 ++++++++++----------
 .../{glib-2.0_git.bb => glib-2.0_2.30.0.bb}        |   21 ++++--
 5 files changed, 65 insertions(+), 110 deletions(-)
 delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
 delete mode 100644 meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
 rename meta-oe/recipes-core/glib-2.0/{glib-2.0_git.bb => glib-2.0_2.30.0.bb} (61%)

diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
deleted file mode 100644
index ad1ca12..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/0003-gatomic-proper-pointer-get-cast.patch.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 3d371334d5668bcd02a38ff99884bd343c244d68 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 23:51:35 +0200
-Subject: [PATCH 3/7] gatomic-proper-pointer-get-cast.patch
-
-Upstream-Status: Unknown
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- glib/gatomic.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/glib/gatomic.h b/glib/gatomic.h
-index ddd39b8..b758142 100644
---- a/glib/gatomic.h
-+++ b/glib/gatomic.h
-@@ -70,7 +70,7 @@ void     g_atomic_pointer_set                  (volatile gpointer G_GNUC_MAY_ALI
-   (g_atomic_int_set) ((volatile gint G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
- # define g_atomic_pointer_get(atomic) \
-  ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
--  (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic)))
-+  (g_atomic_pointer_get) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void G_GNUC_MAY_ALIAS *) (atomic)))
- # define g_atomic_pointer_set(atomic, newval) \
-  ((void) sizeof (gchar [sizeof (*(atomic)) == sizeof (gpointer) ? 1 : -1]), \
-   (g_atomic_pointer_set) ((volatile gpointer G_GNUC_MAY_ALIAS *) (volatile void *) (atomic), (newval)))
--- 
-1.6.6.1
-
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
deleted file mode 100644
index 6780330..0000000
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/0005-glib-mkenums-interpreter.patch.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From a8e5c4a808e7f8572bd5023645a6cb4386b9aff8 Mon Sep 17 00:00:00 2001
-From: Koen Kooi <koen@dominion.thruhere.net>
-Date: Sat, 18 Jun 2011 23:52:17 +0200
-Subject: [PATCH 5/7] don't leak buildpaths into perl hashbang
-
-Upstream-Status: Unknown
-
-Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
----
- gobject/glib-mkenums.in |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in
-index 6372245..b486fe9 100755
---- a/gobject/glib-mkenums.in
-+++ b/gobject/glib-mkenums.in
-@@ -1,4 +1,4 @@
--#! @PERL_PATH@
-+#! /usr/bin/env perl
- 
- use warnings;
- use File::Basename;
--- 
-1.6.6.1
-
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
index b65a474..4ff7b80 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/60_wait-longer-for-threads-to-die.patch
+++ b/meta-oe/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
 
 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 -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 <glib.h>
@@ -18,16 +18,16 @@ diff -ruN glib-2.27.3-orig/tests/threadpool-test.c glib-2.27.3/tests/threadpool-
  
  #define WAIT                5    /* seconds */
  #define MAX_THREADS         10
-@@ -124,10 +124,10 @@
-    DEBUG_MSG (("[unused] stopping unused threads"));
-    g_thread_pool_stop_unused_threads ();
+@@ -130,10 +130,10 @@
+            test_count_threads () == 0)
+          break;
  
--   DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
-+   DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
+-       DEBUG_MSG (("[unused] waiting ONE second for threads to die"));
++       DEBUG_MSG (("[unused] waiting FIVE second for threads to die"));
  
-    /* Some time for threads to die. */
--   g_usleep (G_USEC_PER_SEC);
-+   g_usleep (5 * G_USEC_PER_SEC);
+        /* Some time for threads to die. */
+-       g_usleep (G_USEC_PER_SEC);
++       g_usleep (5 * G_USEC_PER_SEC);
+      }
  
     DEBUG_MSG (("[unused] stopped idle threads, %d remain, %d threads still exist",
- 	       g_thread_pool_get_num_unused_threads (),
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch b/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
index 3300eb0..05805d0 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
+++ b/meta-oe/recipes-core/glib-2.0/glib-2.0/remove.test.for.qsort_r.patch
@@ -1,52 +1,49 @@
 while cross compiling we cannot execute run tests
 
-diff --git a/configure.ac b/configure.ac
-index 378b082..3f2a8d3 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -580,46 +580,7 @@ AC_FUNC_VPRINTF
- AC_FUNC_ALLOCA
- AC_CHECK_FUNCS(mmap posix_memalign memalign valloc fsync pipe2)
- AC_CHECK_FUNCS(atexit on_exit timegm gmtime_r)
+--- glib-2.30.0.orig/configure.ac	2011-09-29 16:57:35.000000000 +0200
++++ glib-2.30.0/configure.ac	2011-09-29 17:00:19.931493488 +0200
+@@ -586,45 +586,7 @@
+ dnl until we have checked this function is actually usable
+ AC_CHECK_FUNC([qsort_r])
+ 
 -# BSD has a qsort_r with wrong argument order
--AC_CACHE_CHECK([for qsort_r], glib_cv_have_qsort_r, [
--AC_RUN_IFELSE([AC_LANG_SOURCE([[
--#define _GNU_SOURCE
--#include <stdlib.h>
+-if test x$ac_cv_func_qsort_r = xyes ; then
+-  AC_CACHE_CHECK([if qsort_r uses glibc compatible argument order], glib_cv_have_qsort_r, [
+-  AC_RUN_IFELSE([AC_LANG_SOURCE([[
+-  #define _GNU_SOURCE
+-  #include <stdlib.h>
 -
--static int
--cmp (const void *a, const void *b, void *c)
--{
--  const int *ia = a;
--  const int *ib = b;
+-  static int
+-  cmp (const void *a, const void *b, void *c)
+-  {
+-    const int *ia = a;
+-    const int *ib = b;
 -
--  if (*ia < *ib)
--    return -1;
--  else if (*ia > *ib)
--    return 1;
--  else
--    return 0;
--}
+-    if (*ia < *ib)
+-      return -1;
+-    else if (*ia > *ib)
+-      return 1;
+-    else
+-      return 0;
+-  }
 -
--int
--main (int argc, char **argv)
--{
--  int arr[3] = { 1, 2, 0 };
--  int d = 3;
+-  int
+-  main (int argc, char **argv)
+-  {
+-    int arr[3] = { 1, 2, 0 };
+-    int d = 3;
 -
--  qsort_r (arr, 3, sizeof (int), cmp, &d);
+-    qsort_r (arr, 3, sizeof (int), cmp, &d);
 -
--  if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2)
--    return 0;
--  else
--    return 1;
--}]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
+-    if (arr[0] == 0 && arr[1] == 1 && arr[2] == 2)
+-      return 0;
+-    else
+-      return 1;
+-  }]])],[glib_cv_have_qsort_r=yes],[glib_cv_have_qsort_r=no])])
+-fi
 -
--if test $glib_cv_have_qsort_r = yes ; then
--  AC_MSG_RESULT([yes])
--    AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
--else
--  AC_MSG_RESULT([no])
+-if test x$glib_cv_have_qsort_r = xyes ; then
+-  AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
 -fi
 +AC_DEFINE(HAVE_QSORT_R, 1, [Define to 1 if you have the 'qsort_r' function])
  
diff --git a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
similarity index 61%
rename from meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
rename to meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
index 34fcaf6..b4305b8 100644
--- a/meta-oe/recipes-core/glib-2.0/glib-2.0_git.bb
+++ b/meta-oe/recipes-core/glib-2.0/glib-2.0_2.30.0.bb
@@ -1,22 +1,22 @@
 require glib.inc
 
 PE = "1"
-PR = "r1"
 
 DEFAULT_PREFERENCE = "-1"
 
 DEPENDS += "libffi python-argparse-native"
 DEPENDS_virtclass-native += "libffi-native python-argparse-native"
 
-SRC_URI = "git://git.gnome.org/glib;protocol=git;branch=master \
+SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}"
+
+SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch \
            file://60_wait-longer-for-threads-to-die.patch \
            file://g_once_init_enter.patch \
            file://remove.test.for.qsort_r.patch \
           "
-SRCREV = "d97cbc6731deab137770bc0fe9c69b06f689f5b4"
-PV = "2.29.3+gitr${SRCPV}"
-S = "${WORKDIR}/git"
+SRC_URI[md5sum] = "fee101d9d7daa8ddfbae00325f307f3b"
+SRC_URI[sha256sum] = "ca9c731017ab370859e847f8b70079bc6dcf389dc0ccb0d0419925aff81b9687"
 
 # Only apply this patch for target recipe on uclibc
 SRC_URI_append_libc-uclibc = " ${@['', 'file://no-iconv.patch']['${PN}' == '${BPN}']}"
@@ -30,3 +30,14 @@ do_configure_prepend() {
   sed -i 's/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs/SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po/g' ${S}/Makefile.am
   sed -i -e "s:TEST_PROGS += gdbus-serialization::g"  ${S}/gio/tests/Makefile.am
 }
+
+do_install_append() {
+  # remove some unpackaged files
+  rm -f ${D}${datadir}/glib-2.0/gettext/mkinstalldirs
+  rm -f ${D}${datadir}/glib-2.0/gettext/po/Makefile.in.in
+  rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyc
+  rm -f ${D}${libdir}/gdbus-2.0/codegen/*.pyo
+}
+
+PACKAGES += "${PN}-codegen"
+FILES_${PN}-codegen = "${libdir}/gdbus-2.0/codegen/*.py"
-- 
1.7.6.1




^ permalink raw reply related	[flat|nested] 46+ messages in thread