Skip to contentSkip to conversation

gnome-desktop-2.32.1: disable desktop docs

PATCH In review Martin Jansa 4 participants 4 messages May 10, 2011

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gnome-desktop-2.32.1: disable desktop docs

* we don't have gnome-doc-utils-native in DEPENDS to provide xml2po and it calls which xml2po -m docbook -e -t "${mo}"
which doesnt work on host without xml2po
* if we add gnome-doc-utils-native to DEPENDS then it still fails:

  | xsltproc -o fdl-C.omf --stringparam db2omf.basename fdl --stringparam db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML V4.1.2//EN" --stringparam db2omf.lang C --stringparam db2omf.omf_dir "/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help" --stringparam db2omf.omf_in "/OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/gnome-desktop-2.32.1-r0/gnome-desktop-2.32.1/desktop-docs/fdl/fdl.omf.in"  `/OE/tmpdir-shr/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils` C/fdl.xml || { rm -f "fdl-C.omf"; exit 1; }
  | warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"

because pkg-config returns xsl path without sysroot prefix /OE/tmpdir-shr/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
* feel free to fix gnome-doc-utils-native/gnome-doc-utils if you care about desktop docs

---
 recipes/gnome/gnome-desktop_2.32.1.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
recipes/gnome/gnome-desktop_2.32.1.bb +2 -0
index be055c9..e2f5c57 100644
@@ -8,6 +8,8 @@ inherit gnome pkgconfig
 SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67"
 SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d"
 
+EXTRA_OECONF += " --disable-desktop-docs"
+
 do_install_append() {
 	sed  -i 's:#!.*/usr/bin/python:#!/usr/bin/python:' ${D}${bindir}/gnome-about
 }
Signature · 1 line
1.7.5.rc3
#1 lore raw
Quoted 1 line · Martin Jansa

+EXTRA_OECONF += " --disable-desktop-docs"

You don't need a leading space, += does that for you.

p.

Acked-by on v1 1/1
#2 lore raw
In reply to Martin Jansa

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Quoted 4 lines · Martin Jansa

* we don't have gnome-doc-utils-native in DEPENDS to provide xml2po and it calls which xml2po -m docbook -e -t "${mo}"
which doesnt work on host without xml2po
* if we add gnome-doc-utils-native to DEPENDS then it still fails:

Quoted 8 lines
  | xsltproc -o fdl-C.omf --stringparam db2omf.basename fdl --stringparam db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML V4.1.2//EN" --stringparam db2omf.lang C --stringparam db2omf.omf_dir "/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help" --stringparam db2omf.omf_in "/OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/gnome-desktop-2.32.1-r0/gnome-desktop-2.32.1/desktop-docs/fdl/fdl.omf.in"  `/OE/tmpdir-shr/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils` C/fdl.xml || { rm -f "fdl-C.omf"; exit 1; }
  | warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"

because pkg-config returns xsl path without sysroot prefix /OE/tmpdir-shr/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
* feel free to fix gnome-doc-utils-native/gnome-doc-utils if you care about desktop docs

Quoted 9 lines
---
 recipes/gnome/gnome-desktop_2.32.1.bb |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
recipes/gnome/gnome-desktop_2.32.1.bb +0 -0
index be055c9..e2f5c57 100644

recipes/gnome/gnome-desktop_2.32.1.bb inherit gnome pkgconfig · line 15

Quoted 8 lines
recipes/gnome/gnome-desktop_2.32.1.bb +2 -0
@@ -8,6 +8,8 @@ inherit gnome pkgconfig
 SRC_URI[archive.md5sum] = "5c80d628a240eb9d9ff78913b31f2f67"
 SRC_URI[archive.sha256sum] = "55cbecf67efe1fa1e57ac966520a7c46d799c8ba3c652a1219f60cafccb3739d"
 
+EXTRA_OECONF += " --disable-desktop-docs"
+
 do_install_append() {
 	sed  -i 's:#!.*/usr/bin/python:#!/usr/bin/python:' ${D}${bindir}/gnome-about
 }

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFNyRoeMkyGM64RGpERAon5AKCoeo+JjoqNnsJQE8SwAPOts0O/cACfT0pz mGeRoZ2pH7larXtg5Jybvpk=
=1VfH
-----END PGP SIGNATURE-----

Acked-by on v1 1/1
#3 lore raw
In reply to Martin Jansa

Am Dienstag, den 10.05.2011, 12:43 +0200 schrieb Martin Jansa:

Quoted 10 lines

* we don't have gnome-doc-utils-native in DEPENDS to provide xml2po and it calls which xml2po -m docbook -e -t "${mo}"
which doesnt work on host without xml2po
* if we add gnome-doc-utils-native to DEPENDS then it still fails:

  | xsltproc -o fdl-C.omf --stringparam db2omf.basename fdl --stringparam db2omf.format 'docbook' --stringparam db2omf.dtd "-//OASIS//DTD DocBook XML V4.1.2//EN" --stringparam db2omf.lang C --stringparam db2omf.omf_dir "/usr/share/omf" --stringparam db2omf.help_dir "/usr/share/gnome/help" --stringparam db2omf.omf_in "/OE/tmpdir-shr/work/armv4t-oe-linux-gnueabi/gnome-desktop-2.32.1-r0/gnome-desktop-2.32.1/desktop-docs/fdl/fdl.omf.in"  `/OE/tmpdir-shr/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils` C/fdl.xml || { rm -f "fdl-C.omf"; exit 1; }
  | warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"

because pkg-config returns xsl path without sysroot prefix /OE/tmpdir-shr/sysroots/x86_64-linux/usr/bin/pkg-config --variable db2omf gnome-doc-utils /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
* feel free to fix gnome-doc-utils-native/gnome-doc-utils if you care about desktop docs

The problem is the path

/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl

is constructed from the variable datadir in the pc file of gnome-doc-utils. I only see a problem that we cannot just put PKG_CONFIG_SYSROOT_DIR in front of it, that some programs could take this value during compile time to actually store data in it during run time.

Evince suffers from the same problem as far as I know [1]. How should that be fixed properly upstream? Any ideas [2]?

Quoted 1 line

[…]

With the bit Phil pointed out corrected this patch is

I build tested it using angstrom-2010.x for MACHINE = "beagleboard".

Thanks,

Paul

[1] http://lists.freedesktop.org/archives/pkg-config/2011-April/000717.html
[2] http://lists.freedesktop.org/archives/pkg-config/2011-May/000742.html