Patchwork [meta-gnome] evince: add cross-compile-fix.patch from classic oe to fix build error

login
mail settings
Submitter Andreas Müller
Date Jan. 16, 2012, 4:32 p.m.
Message ID <1326731540-15786-1-git-send-email-schnitzeltony@gmx.de>
Download mbox | patch
Permalink /patch/19435/
State Accepted
Commit 9c926e88fc2dbb89b592e906ea19f2e41b344825
Headers show

Comments

Andreas Müller - Jan. 16, 2012, 4:32 p.m.
error message was

| warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"
| cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
| warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"
| cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
| make[2]: *** [evince-C.omf] Error 1

[1] http://cgit.openembedded.org/openembedded/tree/recipes/evince/evince/cross-compile-fix.patch

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
---
 .../evince/evince/cross-compile-fix.patch          |   25 ++++++++++++++++++++
 meta-gnome/recipes-gnome/evince/evince_2.32.0.bb   |    4 +++
 2 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
Samuel Stirtzel - Jan. 18, 2012, 9:47 a.m.
2012/1/16 Andreas Müller <schnitzeltony@gmx.de>:
> error message was
>
> | warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"
> | cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
> | warning: failed to load external entity "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl"
> | cannot parse /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
> | make[2]: *** [evince-C.omf] Error 1
>
> [1] http://cgit.openembedded.org/openembedded/tree/recipes/evince/evince/cross-compile-fix.patch
>
> Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
> ---
>  .../evince/evince/cross-compile-fix.patch          |   25 ++++++++++++++++++++
>  meta-gnome/recipes-gnome/evince/evince_2.32.0.bb   |    4 +++
>  2 files changed, 29 insertions(+), 0 deletions(-)
>  create mode 100644 meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
>
> diff --git a/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
> new file mode 100644
> index 0000000..6f5420a
> --- /dev/null
> +++ b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
> @@ -0,0 +1,25 @@
> +Index: evince-2.30.0/gnome-doc-utils.make
> +===================================================================
> +--- evince-2.30.0.orig/gnome-doc-utils.make    2010-03-29 11:52:47.000000000 -0700
> ++++ evince-2.30.0/gnome-doc-utils.make 2010-08-17 15:20:22.597646001 -0700
> +@@ -132,13 +132,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
> +
> + _xml2po ?= `which xml2po`
> + _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
> +-
> +-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
> +-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
> +-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
> +-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
> +-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
> +-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
> ++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
> ++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
> ++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
> ++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
> ++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
> ++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
> +
> + if ENABLE_SK
> + _ENABLE_SK = true
> +
> diff --git a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
> index 899d416..ec54fbc 100644
> --- a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
> +++ b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
> @@ -4,8 +4,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
>  SECTION = "x11/office"
>  DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring nautilus tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade"
>
> +PR = "r1"
> +
>  inherit gnome pkgconfig gtk-icon-cache
>
> +SRC_URI += "file://cross-compile-fix.patch"
> +
>  SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319"
>  SRC_URI[archive.sha256sum] = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"
>
> --
> 1.7.6.4
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Hi,
currently I'm facing the same problem here, any updates regarding the
status of this patch?
Andreas Müller - Jan. 19, 2012, 1:32 p.m.
On Monday, January 16, 2012 05:32:20 PM Andreas Müller wrote:
> error message was
> 
> | warning: failed to load external entity
> | "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl" cannot parse
> | /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
> | warning: failed to load external entity
> | "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl" cannot parse
> | /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl
> | make[2]: *** [evince-C.omf] Error 1
> 
> [1]
> http://cgit.openembedded.org/openembedded/tree/recipes/evince/evince/cross
> -compile-fix.patch
> 
> Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
ping
Koen Kooi - Jan. 19, 2012, 3:03 p.m.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 19-01-12 14:32, Andreas Müller schreef:
> On Monday, January 16, 2012 05:32:20 PM Andreas Müller wrote:
>> error message was
>> 
>> | warning: failed to load external entity |
>> "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl" cannot parse |
>> /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl | warning: failed to
>> load external entity |
>> "/usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl" cannot parse |
>> /usr/share/xml/gnome/xslt/docbook/omf/db2omf.xsl | make[2]: ***
>> [evince-C.omf] Error 1
>> 
>> [1] 
>> http://cgit.openembedded.org/openembedded/tree/recipes/evince/evince/cross
>>
>> 
- -compile-fix.patch
>> 
>> Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
> ping

It's queued, I'll push it later this week.

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (Darwin)
Comment: GPGTools - http://gpgtools.org

iEYEARECAAYFAk8YMMgACgkQMkyGM64RGpFuLQCfdyhONhBnG3+YaV+fLfD2qnBv
cgQAoJwtF8oSwrBnIBFouxTTXebNf+R7
=N1X8
-----END PGP SIGNATURE-----

Patch

diff --git a/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
new file mode 100644
index 0000000..6f5420a
--- /dev/null
+++ b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
@@ -0,0 +1,25 @@ 
+Index: evince-2.30.0/gnome-doc-utils.make
+===================================================================
+--- evince-2.30.0.orig/gnome-doc-utils.make	2010-03-29 11:52:47.000000000 -0700
++++ evince-2.30.0/gnome-doc-utils.make	2010-08-17 15:20:22.597646001 -0700
+@@ -132,13 +132,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@
+ 
+ _xml2po ?= `which xml2po`
+ _xml2po_mode = $(if $(DOC_ID),mallard,docbook)
+-
+-_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
+-_db2omf  ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
+-_malrng  ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils`
+-_chunks  ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
+-_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
+-_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
++_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils`
++_db2omf  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
++_malrng  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils`
++_chunks  ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
++_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
++_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+ 
+ if ENABLE_SK
+ _ENABLE_SK = true
+
diff --git a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
index 899d416..ec54fbc 100644
--- a/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
+++ b/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
@@ -4,8 +4,12 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=96f2f8d5ee576a2163977938ea36fa7b"
 SECTION = "x11/office"
 DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring nautilus tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade"
 
+PR = "r1"
+
 inherit gnome pkgconfig gtk-icon-cache
 
+SRC_URI += "file://cross-compile-fix.patch"
+
 SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319"
 SRC_URI[archive.sha256sum] = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7"