summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorConstantin Musca <constantinx.musca@intel.com>2012-08-23 09:13:11 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-24 17:32:55 +0100
commitae751ab589806ecef70c434cf561316424ae52a0 (patch)
treed8265a091e762253bfe03382196b15cc145eaade
parentb9cf3bdb479ce06c788215f2ed8bf38475a62f45 (diff)
downloadpoky-ae751ab589806ecef70c434cf561316424ae52a0.tar.gz
telepathy-idle: upgrade to 0.1.12
Add patch for fixing the _gen/svc-gtk-doc.h target in the makefiles. (From OE-Core rev: a39cad99a95dd5e31213e4661304f515dc48628d) Signed-off-by: Constantin Musca <constantinx.musca@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch37
-rw-r--r--meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb (renamed from meta/recipes-connectivity/telepathy/telepathy-idle_0.1.11.bb)9
2 files changed, 42 insertions, 4 deletions
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 0000000000..a5efed4dbd
--- /dev/null
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch
@@ -0,0 +1,37 @@
1Upstream-Status: Pending
2
3Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
4--- a/extensions/Makefile.am
5+++ b/extensions/Makefile.am
6@@ -37,12 +37,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
7 --xinclude $(tools_dir)/identity.xsl \
8 $< > $@
9
10-extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
11+extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl
12 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
13 $(tools_dir)/doc-generator.xsl \
14 $< > $@
15
16-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
17+_gen/svc.c _gen/svc.h: _gen/all.xml \
18 $(tools_dir)/glib-ginterface-gen.py
19 $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
20 --filename=_gen/svc --signal-marshal-prefix=_idle_ext \
21--- a/extensions/Makefile.in
22+++ b/extensions/Makefile.in
23@@ -585,12 +585,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi
24 --xinclude $(tools_dir)/identity.xsl \
25 $< > $@
26
27-extensions.html: _gen/all.xml $(tools_dir)/doc-generator.xsl
28+extensions.html _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/doc-generator.xsl
29 $(AM_V_GEN)$(XSLTPROC) $(XSLTPROCFLAGS) \
30 $(tools_dir)/doc-generator.xsl \
31 $< > $@
32
33-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml \
34+_gen/svc.c _gen/svc.h: _gen/all.xml \
35 $(tools_dir)/glib-ginterface-gen.py
36 $(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
37 --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
index 291f4f6f5f..c8163e2e98 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"
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 12
12SRC_URI[md5sum] = "be277e8f0bd32ae56af799f0ff4ec72e" 13SRC_URI[md5sum] = "e77e5b84cc8f77cf12d15727c30df366"
13SRC_URI[sha256sum] = "047ccbec0b91ac187467ede5a90966f9ec881df56fd8c80cb3bce3710f66fda0" 14SRC_URI[sha256sum] = "5343aede5f68450735be8e835143795d5d95151b64d35fd7a99c2a24a771e33b"
14 15
15inherit autotools pkgconfig 16inherit autotools pkgconfig
16 17