* [PATCH 0/2] Telepathy package upgrades
@ 2012-08-23 6:13 Constantin Musca
2012-08-23 6:13 ` [PATCH 1/2] telepathy-glib: update to 0.19.6 Constantin Musca
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Constantin Musca @ 2012-08-23 6:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Constantin Musca
This is another set of package upgrades compiled on all architectures
and tested using core-image-sato-sdk.
Constantin Musca (2):
telepathy-glib: update to 0.19.6
telepathy-idle: upgrade to 0.1.12
...Fix-a-race-in-_gen-reentrant-methods.list.patch | 42 --------------------
...thy-glib_0.19.2.bb => telepathy-glib_0.19.6.bb} | 9 ++---
.../fix-svc-gtk-doc.h-target.patch | 37 +++++++++++++++++
...thy-idle_0.1.11.bb => telepathy-idle_0.1.12.bb} | 9 +++--
4 files changed, 46 insertions(+), 51 deletions(-)
delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
rename meta/recipes-connectivity/telepathy/{telepathy-glib_0.19.2.bb => telepathy-glib_0.19.6.bb} (68%)
create mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
rename meta/recipes-connectivity/telepathy/{telepathy-idle_0.1.11.bb => telepathy-idle_0.1.12.bb} (72%)
--
1.7.9.5
^ permalink raw reply [flat|nested] 4+ messages in thread* [PATCH 1/2] telepathy-glib: update to 0.19.6
2012-08-23 6:13 [PATCH 0/2] Telepathy package upgrades Constantin Musca
@ 2012-08-23 6:13 ` Constantin Musca
2012-08-23 6:13 ` [PATCH 2/2] telepathy-idle: upgrade to 0.1.12 Constantin Musca
2012-08-24 18:12 ` [PATCH 0/2] Telepathy package upgrades Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Constantin Musca @ 2012-08-23 6:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Constantin Musca
The 0001-Fix-a-race-in-_gen-reentrant-methods.list patch is
included in the 0.19.6 version.
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
...Fix-a-race-in-_gen-reentrant-methods.list.patch | 42 --------------------
...thy-glib_0.19.2.bb => telepathy-glib_0.19.6.bb} | 9 ++---
2 files changed, 4 insertions(+), 47 deletions(-)
delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
rename meta/recipes-connectivity/telepathy/{telepathy-glib_0.19.2.bb => telepathy-glib_0.19.6.bb} (68%)
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch b/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
deleted file mode 100644
index 4f8ed2b..0000000
--- a/meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 8ff62dc34961e997fb0224517aef0f12d455a82b Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Wed, 25 Jul 2012 12:58:16 +0100
-Subject: [PATCH] Fix a race in _gen/reentrant-methods.list
-
-Very occasionally, a parallel build will fail like this:
-
-| Making all in telepathy-glib
-| make[2]: Entering directory `/buildarea1/yocto-autobuilder/yocto-slave/nightly-x86/build/build/tmp/work/i586-poky-linux/telepathy-glib-0.19.2-r0/telepathy-glib-0.19.2/telepathy-glib'
-| /bin/mkdir -p _gen
-| ( cd . && cat versions/0.7.0.abi [...] versions/0.19.2.abi ) | \
-| /bin/grep '^tp_cli_.*_run_.*' > _gen/reentrant-methods.list.tmp
-| /bin/sh: line 1: _gen/reentrant-methods.list.tmp: No such file or directory
-| make[2]: *** [_gen/reentrant-methods.list] Error 1
-
-It's doing the mkdir and the subshell in parallel, when the mkdir should be done
-first. Add an explicit dependency on spec-stamp to reentrant-methods.list to
-ensure the ordering.
-
-https://bugs.freedesktop.org/show_bug.cgi?id=52480
-
-Upstream-Status: Submitted
----
- telepathy-glib/codegen.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/telepathy-glib/codegen.am b/telepathy-glib/codegen.am
-index 26caaef..6ad3ec5 100644
---- a/telepathy-glib/codegen.am
-+++ b/telepathy-glib/codegen.am
-@@ -149,7 +149,7 @@ _gen/stable-spec.xml: stable-interfaces.xml _gen/stable-stamp $(tools_dir)/xincl
- # Grab a list of re-entrant tp_cli_*_run_* methods we are committed to
- # generating for backwards compatibility.
- # grep --no-filename is not portable :-(
--_gen/reentrant-methods.list: $(ABI_LISTS) codegen.am
-+_gen/reentrant-methods.list: _gen/spec-stamp $(ABI_LISTS) codegen.am
- $(AM_V_GEN)( cd $(srcdir) && cat $(ABI_LISTS) ) | \
- $(GREP) '^tp_cli_.*_run_.*' > $@.tmp
- @mv $@.tmp $@
---
-1.7.10.4
-
diff --git a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.6.bb
similarity index 68%
rename from meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
rename to meta/recipes-connectivity/telepathy/telepathy-glib_0.19.6.bb
index 9dbc5be..37be67c 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.2.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-glib_0.19.6.bb
@@ -3,13 +3,12 @@ DESCRIPTION = "Telepathy Framework: GLib-based helper library for connection man
HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
DEPENDS = "glib-2.0 dbus python-native-runtime dbus-native dbus-glib"
LICENSE = "LGPLv2.1+"
-PR = "r1"
+PR = "r0"
-SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz \
- file://0001-Fix-a-race-in-_gen-reentrant-methods.list.patch"
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${BPN}-${PV}.tar.gz"
-SRC_URI[md5sum] = "af2b33c1215f189e637bd59cc9139255"
-SRC_URI[sha256sum] = "7e3c313ed08e26339deb603a615cec62a370131075514439f79f473f92ab84c3"
+SRC_URI[md5sum] = "5fa6ecdb3f2b2a18d9a707e5d09fa8c7"
+SRC_URI[sha256sum] = "9fdb1260f4df7a89ff5245ffa72c0331f77affd2cd58cca3714bcfaa5bf473a8"
LIC_FILES_CHKSUM = "file://COPYING;md5=e413d83db6ee8f2c8e6055719096a48e"
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 2/2] telepathy-idle: upgrade to 0.1.12
2012-08-23 6:13 [PATCH 0/2] Telepathy package upgrades Constantin Musca
2012-08-23 6:13 ` [PATCH 1/2] telepathy-glib: update to 0.19.6 Constantin Musca
@ 2012-08-23 6:13 ` Constantin Musca
2012-08-24 18:12 ` [PATCH 0/2] Telepathy package upgrades Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Constantin Musca @ 2012-08-23 6:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Constantin Musca
Add patch for fixing the _gen/svc-gtk-doc.h target in
the makefiles.
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
.../fix-svc-gtk-doc.h-target.patch | 37 ++++++++++++++++++++
...thy-idle_0.1.11.bb => telepathy-idle_0.1.12.bb} | 9 ++---
2 files changed, 42 insertions(+), 4 deletions(-)
create mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
rename meta/recipes-connectivity/telepathy/{telepathy-idle_0.1.11.bb => telepathy-idle_0.1.12.bb} (72%)
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
new file mode 100644
index 0000000..a5efed4
--- /dev/null
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
@@ -0,0 +1,37 @@
+Upstream-Status: Pending
+
+Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
+--- a/extensions/Makefile.am
++++ b/extensions/Makefile.am
+@@ -37,12 +37,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
+ --xinclude $(tools_dir)/identity.xsl \
+ $< > $@
+
+-extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
++extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+ $(tools_dir)/doc-generator.xsl \
+ $< > $@
+
+-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
++_gen/svc.c _gen/svc.h: _gen/all.xml \
+ $(tools_dir)/glib-ginterface-gen.py
+ $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+ --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
+--- a/extensions/Makefile.in
++++ b/extensions/Makefile.in
+@@ -585,12 +585,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
+ --xinclude $(tools_dir)/identity.xsl \
+ $< > $@
+
+-extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
++extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl
+ $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
+ $(tools_dir)/doc-generator.xsl \
+ $< > $@
+
+-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
++_gen/svc.c _gen/svc.h: _gen/all.xml \
+ $(tools_dir)/glib-ginterface-gen.py
+ $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
+ --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.11.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
similarity index 72%
rename from meta/recipes-connectivity/telepathy/telepathy-idle_0.1.11.bb
rename to meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
index 291f4f6..c8163e2 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.11.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
@@ -5,12 +5,13 @@ DEPENDS = "glib-2.0 dbus telepathy-glib openssl"
LICENSE = "LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
-PR = "r1"
+PR = "r0"
-SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz"
+SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
+ file://fix-svc-gtk-doc.h-target.patch"
-SRC_URI[md5sum] = "be277e8f0bd32ae56af799f0ff4ec72e"
-SRC_URI[sha256sum] = "047ccbec0b91ac187467ede5a90966f9ec881df56fd8c80cb3bce3710f66fda0"
+SRC_URI[md5sum] = "e77e5b84cc8f77cf12d15727c30df366"
+SRC_URI[sha256sum] = "5343aede5f68450735be8e835143795d5d95151b64d35fd7a99c2a24a771e33b"
inherit autotools pkgconfig
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 0/2] Telepathy package upgrades
2012-08-23 6:13 [PATCH 0/2] Telepathy package upgrades Constantin Musca
2012-08-23 6:13 ` [PATCH 1/2] telepathy-glib: update to 0.19.6 Constantin Musca
2012-08-23 6:13 ` [PATCH 2/2] telepathy-idle: upgrade to 0.1.12 Constantin Musca
@ 2012-08-24 18:12 ` Saul Wold
2 siblings, 0 replies; 4+ messages in thread
From: Saul Wold @ 2012-08-24 18:12 UTC (permalink / raw)
To: Constantin Musca; +Cc: openembedded-core
On 08/22/2012 11:13 PM, Constantin Musca wrote:
> This is another set of package upgrades compiled on all architectures
> and tested using core-image-sato-sdk.
>
> Constantin Musca (2):
> telepathy-glib: update to 0.19.6
> telepathy-idle: upgrade to 0.1.12
>
> ...Fix-a-race-in-_gen-reentrant-methods.list.patch | 42 --------------------
> ...thy-glib_0.19.2.bb => telepathy-glib_0.19.6.bb} | 9 ++---
> .../fix-svc-gtk-doc.h-target.patch | 37 +++++++++++++++++
> ...thy-idle_0.1.11.bb => telepathy-idle_0.1.12.bb} | 9 +++--
> 4 files changed, 46 insertions(+), 51 deletions(-)
> delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-glib/0001-Fix-a-race-in-_gen-reentrant-methods.list.patch
> rename meta/recipes-connectivity/telepathy/{telepathy-glib_0.19.2.bb => telepathy-glib_0.19.6.bb} (68%)
> create mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
> rename meta/recipes-connectivity/telepathy/{telepathy-idle_0.1.11.bb => telepathy-idle_0.1.12.bb} (72%)
>
Merged into OE-Core
Thanks
Sau!
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-08-24 18:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-08-23 6:13 [PATCH 0/2] Telepathy package upgrades Constantin Musca
2012-08-23 6:13 ` [PATCH 1/2] telepathy-glib: update to 0.19.6 Constantin Musca
2012-08-23 6:13 ` [PATCH 2/2] telepathy-idle: upgrade to 0.1.12 Constantin Musca
2012-08-24 18:12 ` [PATCH 0/2] Telepathy package upgrades Saul Wold
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.