Patchwork telepathy-idle: upgrade to 0.1.14

login
register
mail settings
Submitter Cristian Iorga
Date Dec. 21, 2012, 12:48 p.m.
Message ID <1356094136-22853-1-git-send-email-cristian.iorga@intel.com>
Download mbox | patch
Permalink /patch/41435/
State New
Headers show

Comments

Cristian Iorga - Dec. 21, 2012, 12:48 p.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} |    9 ++---
 3 files changed, 4 insertions(+), 44 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} (70%)
Saul Wold - Dec. 24, 2012, 10:56 p.m.
On 12/21/2012 04:48 AM, Cristian Iorga wrote:
> 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} |    9 ++---
>   3 files changed, 4 insertions(+), 44 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} (70%)
>
There seems to be an issue building this.  I tried with MUT and saw a 
python failure, note that it is using /usr/bin/python and not 
python-native, that might be part of the issue.

Sau!

> 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 70%
> 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..1e6e3ea 100644
> --- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
> +++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb
> @@ -5,14 +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 \
> -           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
>
>
DEBUG: SITE files ['endian-little', 'common-linux', 'common-glibc', 'bit-64', 'x86_64-linux', 'common']
DEBUG: Executing shell function do_compile
NOTE: make -j 8
make  all-recursive
make[1]: Entering directory `/intel/builds/world/tmp/work/x86_64-poky-linux/telepathy-idle/0.1.14-r0/telepathy-idle-0.1.14'
Making all in tools
make[2]: Entering directory `/intel/builds/world/tmp/work/x86_64-poky-linux/telepathy-idle/0.1.14-r0/telepathy-idle-0.1.14/tools'
make[2]: Nothing to be done for `all'.
make[2]: Leaving directory `/intel/builds/world/tmp/work/x86_64-poky-linux/telepathy-idle/0.1.14-r0/telepathy-idle-0.1.14/tools'
Making all in extensions
make[2]: Entering directory `/intel/builds/world/tmp/work/x86_64-poky-linux/telepathy-idle/0.1.14-r0/telepathy-idle-0.1.14/extensions'
/usr/bin/python ../tools/glib-ginterface-gen.py \
		--filename=_gen/svc --signal-marshal-prefix=_idle_ext \
		--include='<telepathy-glib/dbus.h>' \
		--not-implemented-func='tp_dbus_g_method_return_not_implemented' \
		--allow-unstable \
		_gen/all.xml Idle_Svc_
Traceback (most recent call last):
  File "../tools/glib-ginterface-gen.py", line 835, in <module>
    dom = xml.dom.minidom.parse(argv[0])
  File "/usr/lib/python2.7/xml/dom/minidom.py", line 1920, in parse
    return expatbuilder.parse(file)
  File "/usr/lib/python2.7/xml/dom/expatbuilder.py", line 924, in parse
    result = builder.parseFile(fp)
  File "/usr/lib/python2.7/xml/dom/expatbuilder.py", line 207, in parseFile
    parser.Parse(buffer, 0)
xml.parsers.expat.ExpatError: duplicate attribute: line 46, column 36
make[2]: *** [_gen/svc.c] Error 1
make[2]: Leaving directory `/intel/builds/world/tmp/work/x86_64-poky-linux/telepathy-idle/0.1.14-r0/telepathy-idle-0.1.14/extensions'
make[1]: *** [all-recursive] Error 1
make[1]: Leaving directory `/intel/builds/world/tmp/work/x86_64-poky-linux/telepathy-idle/0.1.14-r0/telepathy-idle-0.1.14'
make: *** [all] Error 2
ERROR: oe_runmake failed
ERROR: Function failed: do_compile (see /intel/builds/world/tmp/work/x86_64-poky-linux/telepathy-idle/0.1.14-r0/temp/log.do_compile.28649 for further information)

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 70%
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..1e6e3ea 100644
--- a/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.12.bb
+++ b/meta/recipes-connectivity/telepathy/telepathy-idle_0.1.14.bb
@@ -5,14 +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 \
-           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