[oe-commits] Khem Raj : evince_2.30.0.bb: Make pkg-config to construct right paths.

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: b2c2771ddc0e5ddc307999a9a63c5bade88d5956
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=b2c2771ddc0e5ddc307999a9a63c5bade88d5956

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Aug 17 13:29:41 2010 -0700

evince_2.30.0.bb: Make pkg-config to construct right paths.

* pkg-config has nice option PKG_CONFIG_SYSROOT_DIR
  for cross compiling but its only for include and libraries
  it is ignored for other things pkg-config provides.

* this fixes the needed. There may be more places that needs
  same fix. For us this one suffices for now.

* Add gnome-doc-utils-native to DEPENDS.

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 recipes/evince/evince/cross-compile-fix.patch |   24 ++++++++++++++++++++++++
 recipes/evince/evince_2.30.0.bb               |    6 +++++-
 2 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/recipes/evince/evince/cross-compile-fix.patch b/recipes/evince/evince/cross-compile-fix.patch
new file mode 100644
index 0000000..d99b675
--- /dev/null
+++ b/recipes/evince/evince/cross-compile-fix.patch
@@ -0,0 +1,24 @@
+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/recipes/evince/evince_2.30.0.bb b/recipes/evince/evince_2.30.0.bb
index 4ebce26..6c8f9d4 100644
--- a/recipes/evince/evince_2.30.0.bb
+++ b/recipes/evince/evince_2.30.0.bb
@@ -2,11 +2,15 @@ DESCRIPTION = "Evince is a document viewer for document formats like pdf, ps, dj
 LICENSE = "GPL"
 SECTION = "x11/office"
 DEPENDS = "nautilus gnome-icon-theme tiff libxt espgs gnome-doc-utils poppler libxml2 gtk+ gconf libglade gnome-keyring "
+DEPENDS += "gnome-doc-utils-native"
+
 RDEPENDS_${PN} = "espgs gnome-icon-theme"
-PR = "r1"
+PR = "r2"
 
 inherit gnome pkgconfig gtk-icon-cache
 
+SRC_URI += "file://cross-compile-fix.patch"
+
 SRC_URI[archive.md5sum] = "a55f1997891a64157286b6f6b00f8458"
 SRC_URI[archive.sha256sum] = "36dfee4e973421f15cb51c9b1c84784523592dc81feb6465fb59f87b8f7f8bf7"