* [PATCH 0/1] fix gnome-desktop build failure
@ 2010-12-14 7:38 Dexuan Cui
2010-12-14 7:18 ` [PATCH 1/1] gnome-desktop: add --disable-desktop-docs Dexuan Cui
2010-12-15 17:14 ` [PATCH 0/1] fix gnome-desktop build failure Saul Wold
0 siblings, 2 replies; 3+ messages in thread
From: Dexuan Cui @ 2010-12-14 7:38 UTC (permalink / raw)
To: poky
This is used to fix Bug 587 - gnome-desktop: do_compile failed.
Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: dcui/master
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master
Thanks,
Dexuan Cui <dexuan.cui@intel.com>
---
Dexuan Cui (1):
gnome-desktop: add --disable-desktop-docs
meta/recipes-gnome/gnome/gnome-desktop.inc | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
--
1.7.2
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH 1/1] gnome-desktop: add --disable-desktop-docs
2010-12-14 7:38 [PATCH 0/1] fix gnome-desktop build failure Dexuan Cui
@ 2010-12-14 7:18 ` Dexuan Cui
2010-12-15 17:14 ` [PATCH 0/1] fix gnome-desktop build failure Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Dexuan Cui @ 2010-12-14 7:18 UTC (permalink / raw)
To: poky
autobuilder logs show the below failure:
| xsltproc -o lgpl-vi.omf --stringparam db2omf.basename lgpl --stringparam
db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML
V4.1.2//EN" --stringparam db2omf.lang vi --stringparam db2omf.omf_dir
"/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help"
--stringparam db2omf.omf_in ...
| http://www.oasis-open.org/docbook/xml/4.1.2/dbpoolx.mod:632: parser warning :
PEReference: %notation.class; not found
| ...
| unable to parse oc/lgpl.xml
| make[3]: *** [lgpl-oc.omf] Error 1
However this issue can't be reproduced in my Ubuntu 9.04 system. I suppose
it's because on autobuilder the newer libxml has a stricter syntax requirement
about the related xml files.
Actually before commit b8b13dcbb76fdc3c9a2866bb35945dcf949c4b20 upgraded
gnome-desktop to 2.32.1, we also didn't build desktop-docs. The commit removed
no-desktop-docs.patch but didn't notice the Makefile.am depends on
--disable-desktop-docs to decice whether desktop-docs will be built.
So we should continue to make sure desktop-docs is not built.
Fixes [BUGID: 587]
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
---
meta/recipes-gnome/gnome/gnome-desktop.inc | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-gnome/gnome/gnome-desktop.inc b/meta/recipes-gnome/gnome/gnome-desktop.inc
index fb330a5..123f82d 100644
--- a/meta/recipes-gnome/gnome/gnome-desktop.inc
+++ b/meta/recipes-gnome/gnome/gnome-desktop.inc
@@ -3,7 +3,7 @@ SECTION = "x11/gnome"
LICENSE = "GPLv2 & LGPLv2"
DEPENDS = "gconf-dbus libxrandr virtual/libx11 gtk+ glib-2.0 gnome-doc-utils"
-EXTRA_OECONF = "--disable-scrollkeeper"
+EXTRA_OECONF = "--disable-scrollkeeper --disable-desktop-docs"
do_configure_prepend () {
cp ${STAGING_DATADIR}/gnome-common/data/omf.make ${S}
@@ -11,4 +11,7 @@ do_configure_prepend () {
FILES_${PN} += "${datadir}/gnome-about"
-inherit gnome pkgconfig
\ No newline at end of file
+PR = "r1"
+
+inherit gnome pkgconfig
+
--
1.7.2
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH 0/1] fix gnome-desktop build failure
2010-12-14 7:38 [PATCH 0/1] fix gnome-desktop build failure Dexuan Cui
2010-12-14 7:18 ` [PATCH 1/1] gnome-desktop: add --disable-desktop-docs Dexuan Cui
@ 2010-12-15 17:14 ` Saul Wold
1 sibling, 0 replies; 3+ messages in thread
From: Saul Wold @ 2010-12-15 17:14 UTC (permalink / raw)
To: Dexuan Cui; +Cc: poky
On 12/13/2010 11:38 PM, Dexuan Cui wrote:
> This is used to fix Bug 587 - gnome-desktop: do_compile failed.
>
> Pull URL: git://git.pokylinux.org/poky-contrib.git
> Branch: dcui/master
> Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/master
>
> Thanks,
> Dexuan Cui<dexuan.cui@intel.com>
> ---
>
>
> Dexuan Cui (1):
> gnome-desktop: add --disable-desktop-docs
>
> meta/recipes-gnome/gnome/gnome-desktop.inc | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
Thanks for the fast turn, this is pulled into M2 and Master
Sau!
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-12-15 17:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-12-14 7:38 [PATCH 0/1] fix gnome-desktop build failure Dexuan Cui
2010-12-14 7:18 ` [PATCH 1/1] gnome-desktop: add --disable-desktop-docs Dexuan Cui
2010-12-15 17:14 ` [PATCH 0/1] fix gnome-desktop build failure Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox