From: Andreas Müller <schnitzeltony@gmx.de>
Date: Mon, 16 Jan 2012 16:32:20 +0000 (+0000)
Subject: evince: add cross-compile-fix.patch from classic oe to fix build error
X-Git-Tag: rev_ivi_2015_02_04~5096
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ee01e45973c7ad25a7d243f1bad308ac14c99ca4;p=scm%2Fbb%2Ftizen-distro.git

evince: add cross-compile-fix.patch from classic oe to fix build error

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

(From meta-openembedded rev: 9c926e88fc2dbb89b592e906ea19f2e41b344825)

Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
---

diff --git a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch
new file mode 100644
index 0000000..6f5420a
--- /dev/null
+++ b/meta-openembedded/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-openembedded/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb b/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
index 899d416..ec54fbc 100644
--- a/meta-openembedded/meta-gnome/recipes-gnome/evince/evince_2.32.0.bb
+++ b/meta-openembedded/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"