summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorCristian Iorga <cristian.iorga@intel.com>2013-01-07 12:49:05 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-10 23:43:06 +0000
commitebf8c55565929cced6bb9ed645fbfbc1110cf31c (patch)
treedef892b8e99651d816d958e836319acb7bad238b /meta
parent0624d147f2a0edc5cab39278972db66e48db95f0 (diff)
downloadpoky-ebf8c55565929cced6bb9ed645fbfbc1110cf31c.tar.gz
telepathy-idle: upgrade to 0.1.14
(From OE-Core rev: dfd69a669c57200bc3846709483db4c82c87d300) Signed-off-by: Cristian Iorga <cristian.iorga@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch39
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle-0.1.14/fix-svc-gtk-doc.h-target.patch (renamed from meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch)0
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb (renamed from meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb)11
3 files changed, 5 insertions, 45 deletions
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 0aeed09c40..0000000000
--- a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch
+++ /dev/null
@@ -1,39 +0,0 @@
1From b092172e56393fad70e472afa26df4f886dfdbc0 Mon Sep 17 00:00:00 2001
2From: Dan Winship <danw@gnome.org>
3Date: Fri, 24 Aug 2012 12:19:45 -0400
4Subject: [PATCH] build: fix for "make -j" safety
5
6A make rule with multiple (non-pattern) targets just says that each of
7those files can be built by the rule, not that the rule builds all of
8them at once. So under "make -j", extensions/Makefile would run three
9copies of glib-ginterface-gen.py at once, which could end up deleting
10each others' files and causing a make failure. Fix.
11
12Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
13
14Upstream-Status: Backport [b092172e56393fad70e472afa26df4f886dfdbc0]
15Signed-off-by: Ross Burton <ross.burton@intel.com>
16
17---
18 extensions/Makefile.am | 5 ++++-
19 1 file changed, 4 insertions(+), 1 deletion(-)
20
21diff --git a/extensions/Makefile.am b/extensions/Makefile.am
22index 24efb6e..bb837da 100644
23--- a/extensions/Makefile.am
24+++ b/extensions/Makefile.am
25@@ -42,7 +42,10 @@ extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
26 $(tools_dir)/doc-generator.xsl \
27 $< > $@
28
29-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
30+_gen/svc.h: _gen/svc.c
31+_gen/svc-gtk-doc.h: _gen/svc.c
32+
33+_gen/svc.c: _gen/all.xml \
34 $(tools_dir)/glib-ginterface-gen.py
35 $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
36 --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
37--
381.7.10.4
39
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
index 2cd2c78c31..2cd2c78c31 100644
--- 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
diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb
index c9e8b3b573..02250eac6e 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"
5LICENSE = "LGPLv2.1" 5LICENSE = "LGPLv2.1"
6LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \ 6LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1 \
7 file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9" 7 file://src/idle.c;beginline=1;endline=19;md5=b06b1e2594423111a1a7910b0eefc7f9"
8PR = "r1" 8PR = "r0"
9 9
10SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ 10SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \
11 file://fix-svc-gtk-doc.h-target.patch \ 11 file://fix-svc-gtk-doc.h-target.patch"
12 file://build-fix-for-make-j-safety.patch"
13 12
14SRC_URI[md5sum] = "e77e5b84cc8f77cf12d15727c30df366" 13SRC_URI[md5sum] = "c292c54aa08f61544ab53fda880d861c"
15SRC_URI[sha256sum] = "5343aede5f68450735be8e835143795d5d95151b64d35fd7a99c2a24a771e33b" 14SRC_URI[sha256sum] = "df344e7959d99ab4ee4c0bcde82e6fc652cc48dc93ce11fcd024fa2383068fec"
16 15
17inherit autotools pkgconfig 16inherit autotools pkgconfig pythonnative
18 17
19FILES_${PN} += "${datadir}/telepathy \ 18FILES_${PN} += "${datadir}/telepathy \
20 ${datadir}/dbus-1" 19 ${datadir}/dbus-1"