wv: Fix DEPENDS and pkgconfig file (from Poky)

diff --git a/packages/wv/wv-1.2.0/.mtn2git_empty b/packages/wv/wv-1.2.0/.mtn2git_empty
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/packages/wv/wv-1.2.0/pkgconfig.patch b/packages/wv/wv-1.2.0/pkgconfig.patch
new file mode 100644 (file)
index 0000000..136d893
--- /dev/null
+++ b/packages/wv/wv-1.2.0/pkgconfig.patch
@@ -0,0 +1,13 @@
+Index: wv-1.2.0/wv-1.0.pc.in
+===================================================================
+--- wv-1.2.0.orig/wv-1.0.pc.in 2008-03-19 22:25:18.000000000 +0000
++++ wv-1.2.0/wv-1.0.pc.in      2008-03-19 22:26:32.000000000 +0000
+@@ -6,5 +6,6 @@
+ Name: wvWare
+ Description: Word Document Filter library and utilities
+ Version: @VERSION@
+-Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @GLIB_LIBS@ @GSF_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
+-Cflags: -I${includedir}/wv @GSF_CFLAGS@
++Requires: libgsf-1
++Libs: -L${libdir} -lwv @WMF_LIBS@ @XML_LIBS@ @PNG_LIBS@ @ZLIB_LIBS@ @LIBS@ -lm
++Cflags: -I${includedir}/wv

diff --git a/packages/wv/wv_1.2.0.bb b/packages/wv/wv_1.2.0.bb
index 9e9e65f..7f06f58 100644 (file)
--- a/packages/wv/wv_1.2.0.bb
+++ b/packages/wv/wv_1.2.0.bb
@@ -1,10 +1,11 @@
 DESCRIPTION = "Programs for accessing Microsoft Word documents"
 HOMEPAGE = "http://wvware.sourceforge.net/"
 LICENSE = "GPLv2"
-DEPENDS = "libgsf"
-PR = "r2"
+DEPENDS = "libgsf glib-2.0"
+PR = "r3"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
+           file://pkgconfig.patch;patch=1"
 
 inherit autotools pkgconfig
 
@@ -12,11 +13,6 @@ S = "${WORKDIR}/${PN}-${PV}"
 
 EXTRA_OECONF = ""
 
-do_compile_append () {
-       cp wv-1.0.pc wv-1.0.pc.old
-       sed 's:${STAGING_DIR_HOST}::g' < wv-1.0.pc.old > wv-1.0.pc
-}
-
 do_stage () {
        autotools_stage_all
 }