diff options
| author | Ross Burton <ross.burton@intel.com> | 2012-09-10 13:49:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-12 15:13:37 +0100 |
| commit | ed9bb94f352945d0aef2dd25e03bdc7e2bdeab25 (patch) | |
| tree | 4adfdeb036fc210a5a7e8099db97a0c8097a1768 /meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch | |
| parent | 13221b222b71fc8afdae819056aea85457a9e02e (diff) | |
| download | poky-ed9bb94f352945d0aef2dd25e03bdc7e2bdeab25.tar.gz | |
telepathy-idle: fix parallel build
Apply a patch from upstream git, and clean up our other patch so that it
applies.
[ YOCTO #3056 ]
(From OE-Core rev: b0d23a1e3335ccd9bdc5b6512020ff3321619abf)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch')
| -rw-r--r-- | meta/recipes-connectivity/telepathy/telepathy-idle-0.1.12/fix-svc-gtk-doc.h-target.patch | 24 |
1 files changed, 1 insertions, 23 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 index a5efed4dbd..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.12/fix-svc-gtk-doc.h-target.patch | |||
| @@ -3,7 +3,7 @@ Upstream-Status: Pending | |||
| 3 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | 3 | Signed-off-by: Constantin Musca <constantinx.musca@intel.com> |
| 4 | --- a/extensions/Makefile.am | 4 | --- a/extensions/Makefile.am |
| 5 | +++ b/extensions/Makefile.am | 5 | +++ b/extensions/Makefile.am |
| 6 | @@ -37,12 +37,12 @@ _gen/all.xml: all.xml $(wildcard $(srcdi | 6 | @@ -37,8 +37,8 @@ _gen/all.xml: all.xml $(wildcard $(srcdi |
| 7 | --xinclude $(tools_dir)/identity.xsl \ | 7 | --xinclude $(tools_dir)/identity.xsl \ |
| 8 | $< > $@ | 8 | $< > $@ |
| 9 | 9 | ||
| @@ -13,25 +13,3 @@ Signed-off-by: Constantin Musca <constantinx.musca@intel.com> | |||
| 13 | $(tools_dir)/doc-generator.xsl \ | 13 | $(tools_dir)/doc-generator.xsl \ |
| 14 | $< > $@ | 14 | $< > $@ |
| 15 | 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 \ | ||