From ebf8c55565929cced6bb9ed645fbfbc1110cf31c Mon Sep 17 00:00:00 2001 From: Cristian Iorga Date: Mon, 7 Jan 2013 12:49:05 +0200 Subject: telepathy-idle: upgrade to 0.1.14 (From OE-Core rev: dfd69a669c57200bc3846709483db4c82c87d300) Signed-off-by: Cristian Iorga Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- .../build-fix-for-make-j-safety.patch | 39 ---------------------- .../fix-svc-gtk-doc.h-target.patch | 15 --------- .../fix-svc-gtk-doc.h-target.patch | 15 +++++++++ .../telepathy/telepathy-idle_0.1.12.bb | 20 ----------- .../telepathy/telepathy-idle_0.1.14.bb | 19 +++++++++++ 5 files changed, 34 insertions(+), 74 deletions(-) delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/build-fix-for-make-j-safety.patch delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch create mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle-0.1.14/fix-svc-gtk-doc.h-target.patch delete mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb create mode 100644 meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb (limited to 'meta/recipes-connectivity/telepathy') 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 @@ -From b092172e56393fad70e472afa26df4f886dfdbc0 Mon Sep 17 00:00:00 2001 -From: Dan Winship -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 - -Upstream-Status: Backport [b092172e56393fad70e472afa26df4f886dfdbc0] -Signed-off-by: Ross Burton - ---- - 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.12/fix-svc-gtk-doc.h-target.patch deleted file mode 100644 index 2cd2c78c31..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Constantin Musca ---- a/extensions/Makefile.am -+++ b/extensions/Makefile.am -@@ -37,8 +37,8 @@ _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 \ - $< > $@ - diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.14/fix-svc-gtk-doc.h-target.patch b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.14/fix-svc-gtk-doc.h-target.patch new file mode 100644 index 0000000000..2cd2c78c31 --- /dev/null +++ b/meta/recipes-connectivity/telepathy/telepathy-idle-0.1.14/fix-svc-gtk-doc.h-target.patch @@ -0,0 +1,15 @@ +Upstream-Status: Pending + +Signed-off-by: Constantin Musca +--- a/extensions/Makefile.am ++++ b/extensions/Makefile.am +@@ -37,8 +37,8 @@ _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 \ + $< > $@ + diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb deleted file mode 100644 index c9e8b3b573..0000000000 --- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Telepathy IRC connection manager" -DESCRIPTION = "Telepathy implementation of the Internet Relay Chat protocols." -HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" -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" - -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" - -SRC_URI[md5sum] = "e77e5b84cc8f77cf12d15727c30df366" -SRC_URI[sha256sum] = "5343aede5f68450735be8e835143795d5d95151b64d35fd7a99c2a24a771e33b" - -inherit autotools pkgconfig - -FILES_${PN} += "${datadir}/telepathy \ - ${datadir}/dbus-1" diff --git a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb new file mode 100644 index 0000000000..02250eac6e --- /dev/null +++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb @@ -0,0 +1,19 @@ +SUMMARY = "Telepathy IRC connection manager" +DESCRIPTION = "Telepathy implementation of the Internet Relay Chat protocols." +HOMEPAGE = "http://telepathy.freedesktop.org/wiki/" +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 = "r0" + +SRC_URI = "http://telepathy.freedesktop.org/releases/${BPN}/${BPN}-${PV}.tar.gz \ + file://fix-svc-gtk-doc.h-target.patch" + +SRC_URI[md5sum] = "c292c54aa08f61544ab53fda880d861c" +SRC_URI[sha256sum] = "df344e7959d99ab4ee4c0bcde82e6fc652cc48dc93ce11fcd024fa2383068fec" + +inherit autotools pkgconfig pythonnative + +FILES_${PN} += "${datadir}/telepathy \ + ${datadir}/dbus-1" -- cgit v1.2.3-54-g00ecf