Patchwork [V2] telepathy-idle: upgrade to 0.1.14

login
register
mail settings
Submitter Cristian Iorga
Date Jan. 7, 2013, 10:49 a.m.
Message ID <1357555745-19337-1-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/42157/
State New
Headers show

Comments

Cristian Iorga - Jan. 7, 2013, 10:49 a.m.
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
---
 .../build-fix-for-make-j-safety.patch              |   39 --------------------
 .../fix-svc-gtk-doc.h-target.patch                 |    0
 ...thy-idle_0.1.12.bb => telepathy-idle_0.1.14.bb} |   11 +++---
 3 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
 rename meta/recipes-connectivity/telepathy/{telepathy-idle-0.1.12 => telepathy-idle-0.1.14}/fix-svc-gtk-doc.h-target.patch (100%)
 rename meta/recipes-connectivity/telepathy/{telepathy-idle_0.1.12.bb => telepathy-idle_0.1.14.bb} (67%)

Patch

diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
deleted file mode 100644
index 0aeed09..0000000
--- a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
+++ /dev/null
@@ -1,39 +0,0 @@ 
-From b092172e56393fad70e472afa26df4f886dfdbc0 Mon Sep 17 00:00:00 2001
-From: Dan Winship <danw@gnome.org>
-Date: Fri, 24 Aug 2012 12:19:45 -0400
-Subject: [PATCH] build: fix for "make -j" safety
-
-A make rule with multiple (non-pattern) targets just says that each of
-those files can be built by the rule, not that the rule builds all of
-them at once. So under "make -j", extensions/Makefile would run three
-copies of glib-ginterface-gen.py at once, which could end up deleting
-each others' files and causing a make failure. Fix.
-
-Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
-
-Upstream-Status: Backport [b092172e56393fad70e472afa26df4f886dfdbc0]
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
----
- extensions/Makefile.am |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/extensions/Makefile.am b/extensions/Makefile.am
-index 24efb6e..bb837da 100644
---- a/extensions/Makefile.am
-+++ b/extensions/Makefile.am
-@@ -42,7 +42,10 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
- 		$(tools_dir)/doc-generator.xsl \
- 		$< > $@
- 
--_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
-+_gen/svc.h: _gen/svc.c
-+_gen/svc-gtk-doc.h: _gen/svc.c
-+
-+_gen/svc.c: _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 \
--- 
-1.7.10.4
-
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.14/fix-svc-gtk-doc.h-target.patch
similarity index 100%
rename from meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
rename to meta/recipes-connectivity/telepathy/telepathy-idle-0.1.14/fix-svc-gtk-doc.h-target.patch
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb
similarity index 67%
rename from meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
rename to meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb
index c9e8b3b..02250ea 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb
@@ -5,16 +5,15 @@  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 \
-           file://fix-svc-gtk-doc.h-target.patch \
-           file://build-fix-for-make-j-safety.patch"
+           file://fix-svc-gtk-doc.h-target.patch"
 
-SRC_URI[md5sum] = "e77e5b84cc8f77cf12d15727c30df366"
-SRC_URI[sha256sum] = "5343aede5f68450735be8e835143795d5d95151b64d35fd7a99c2a24a771e33b"
+SRC_URI[md5sum] = "c292c54aa08f61544ab53fda880d861c"
+SRC_URI[sha256sum] = "df344e7959d99ab4ee4c0bcde82e6fc652cc48dc93ce11fcd024fa2383068fec"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig pythonnative
 
 FILES_${PN} += "${datadir}/telepathy \
                 ${datadir}/dbus-1"