diff options
| author | Andreas Müller <schnitzeltony@gmx.de> | 2012-01-16 16:32:20 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-01-20 08:26:34 +0100 |
| commit | 9c926e88fc2dbb89b592e906ea19f2e41b344825 (patch) | |
| tree | 94807ce4c973594eb788a610062728db84619cc1 /meta-gnome | |
| parent | 0ce5ec32b84549a97c65765ca1bd39eeee10f71f (diff) | |
| download | meta-openembedded-9c926e88fc2dbb89b592e906ea19f2e41b344825.tar.gz | |
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
Signed-off-by: Andreas Müller <schnitzeltony@gmx.de>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'meta-gnome')
| -rw-r--r-- | meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch | 25 | ||||
| -rw-r--r-- | meta-gnome/recipes-gnome/evince/evince_2.32.0.bb | 4 |
2 files changed, 29 insertions, 0 deletions
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 0000000000..6f5420a52a --- /dev/null +++ b/meta-gnome/recipes-gnome/evince/evince/cross-compile-fix.patch | |||
| @@ -0,0 +1,25 @@ | |||
| 1 | Index: evince-2.30.0/gnome-doc-utils.make | ||
| 2 | =================================================================== | ||
| 3 | --- evince-2.30.0.orig/gnome-doc-utils.make 2010-03-29 11:52:47.000000000 -0700 | ||
| 4 | +++ evince-2.30.0/gnome-doc-utils.make 2010-08-17 15:20:22.597646001 -0700 | ||
| 5 | @@ -132,13 +132,12 @@ _DOC_ABS_SRCDIR = @abs_srcdir@ | ||
| 6 | |||
| 7 | _xml2po ?= `which xml2po` | ||
| 8 | _xml2po_mode = $(if $(DOC_ID),mallard,docbook) | ||
| 9 | - | ||
| 10 | -_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
| 11 | -_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
| 12 | -_malrng ?= `$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
| 13 | -_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
| 14 | -_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
| 15 | -_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
| 16 | +_db2html ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2html gnome-doc-utils` | ||
| 17 | +_db2omf ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable db2omf gnome-doc-utils` | ||
| 18 | +_malrng ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable malrng gnome-doc-utils` | ||
| 19 | +_chunks ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl | ||
| 20 | +_credits ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl | ||
| 21 | +_ids ?= ${PKG_CONFIG_SYSROOT_DIR}`$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl | ||
| 22 | |||
| 23 | if ENABLE_SK | ||
| 24 | _ENABLE_SK = true | ||
| 25 | |||
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 899d416ee7..ec54fbc4ea 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" | |||
| 4 | SECTION = "x11/office" | 4 | SECTION = "x11/office" |
| 5 | DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring nautilus tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade" | 5 | DEPENDS = "gnome-icon-theme gnome-doc-utils-native libgnome-keyring nautilus tiff libxt ghostscript poppler libxml2 gtk+ gconf libglade" |
| 6 | 6 | ||
| 7 | PR = "r1" | ||
| 8 | |||
| 7 | inherit gnome pkgconfig gtk-icon-cache | 9 | inherit gnome pkgconfig gtk-icon-cache |
| 8 | 10 | ||
| 11 | SRC_URI += "file://cross-compile-fix.patch" | ||
| 12 | |||
| 9 | SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319" | 13 | SRC_URI[archive.md5sum] = "ebc3ce6df8dcbf29cb9492f8dd031319" |
| 10 | SRC_URI[archive.sha256sum] = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7" | 14 | SRC_URI[archive.sha256sum] = "2a4c91ae38f8b5028cebb91b9da9ddc50ea8ae3f3d429df89ba351da2d787ff7" |
| 11 | 15 | ||