From: Phil Blundell <philb@gnu.org>
To: Martin Jansa <martin.jansa@gmail.com>
Cc: openembedded-core <openembedded-core@lists.openembedded.org>
Subject: Re: [PATCH] glib-2.0: Update to 2.34.0
Date: Wed, 26 Sep 2012 13:28:24 +0100 [thread overview]
Message-ID: <1348662505.31293.110.camel@phil-desktop> (raw)
In-Reply-To: <20120926122041.GI3313@jama.jama.net>
On Wed, 2012-09-26 at 14:20 +0200, Martin Jansa wrote:
> On Wed, Sep 26, 2012 at 01:17:21PM +0100, Phil Blundell wrote:
> > Signed-off-by: Phil Blundell <pb@pbcl.net>
> > ---
> > .../60_wait-longer-for-threads-to-die.patch | 11 -----
> > meta/recipes-core/glib-2.0/glib-2.0/nodbus.patch | 34 ++++++++--------
> > meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb | 43 --------------------
> > meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb | 43 ++++++++++++++++++++
> > 4 files changed, 61 insertions(+), 70 deletions(-)
> > delete mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.32.4.bb
> > create mode 100644 meta/recipes-core/glib-2.0/glib-2.0_2.34.0.bb
>
> Can you please resend with -M?
As you wish:
From 2f3362045e6084e1a30602918c062ed8a9999b45 Mon Sep 17 00:00:00 2001
From: Phil Blundell <philb@gnu.org>
Date: Wed, 26 Sep 2012 13:15:07 +0100
Subject: [PATCH] glib-2.0: Update to 2.34.0
Signed-off-by: Phil Blundell <pb@pbcl.net>
---
.../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} | 4 +--
3 files changed, 20 insertions(+), 29 deletions(-)
rename meta/recipes-core/glib-2.0/{glib-2.0_2.32.4.bb => glib-2.0_2.34.0.bb} (99%)
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 <glib.h>
-
--#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 99%
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..f4e3682 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"
@@ -13,8 +13,8 @@ SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \
file://configure-libtool.patch \
file://60_wait-longer-for-threads-to-die.patch \
file://glib-2.0_fix_for_x32.patch \
- file://nodbus.patch \
file://nolibelf.patch \
+ file://nodbus.patch \
"
SRC_URI[md5sum] = "bf84fefd9c1a5b5a7a38736f4ddd674a"
SRC_URI[sha256sum] = "a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2"
--
1.7.10.4
next prev parent reply other threads:[~2012-09-26 12:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-09-26 12:17 [PATCH] glib-2.0: Update to 2.34.0 Phil Blundell
2012-09-26 12:20 ` Martin Jansa
2012-09-26 12:28 ` Phil Blundell [this message]
2012-09-26 12:35 ` Phil Blundell
2012-09-26 14:13 ` Colin Walters
2012-09-26 14:14 ` Colin Walters
2012-09-26 14:28 ` Phil Blundell
2012-09-26 14:30 ` Burton, Ross
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1348662505.31293.110.camel@phil-desktop \
--to=philb@gnu.org \
--cc=martin.jansa@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.