[oe-commits] org.oe.dev wv: Fix DEPENDS and pkgconfig file (from Poky)

[hrw commit]

wv: Fix DEPENDS and pkgconfig file (from Poky)

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: aeceb77f28c9fdfb274fd936b3ba30483a14d741
ViewMTN: http://monotone.openembedded.org/revision/info/aeceb77f28c9fdfb274fd936b3ba30483a14d741
Files:
1
packages/wv/wv-1.2.0
packages/wv/wv-1.2.0/pkgconfig.patch
packages/wv/wv_1.2.0.bb
Diffs:

#
# mt diff -ra796b081d8845fac70a8842df854fc7d82eb0b27 -raeceb77f28c9fdfb274fd936b3ba30483a14d741
#
#
#
# add_dir "packages/wv/wv-1.2.0"
# 
# add_file "packages/wv/wv-1.2.0/pkgconfig.patch"
#  content [b429d69751733123d1f22c6a8bdbc8f81248e1d1]
# 
# patch "packages/wv/wv_1.2.0.bb"
#  from [6c83952d5cd537068999ca340f7e8e9135646cbd]
#    to [7743cc48881ffaa7c086c1eddb3fd768237ea42e]
#
============================================================
--- packages/wv/wv-1.2.0/pkgconfig.patch	b429d69751733123d1f22c6a8bdbc8f81248e1d1
+++ packages/wv/wv-1.2.0/pkgconfig.patch	b429d69751733123d1f22c6a8bdbc8f81248e1d1
@@ -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
============================================================
--- packages/wv/wv_1.2.0.bb	6c83952d5cd537068999ca340f7e8e9135646cbd
+++ packages/wv/wv_1.2.0.bb	7743cc48881ffaa7c086c1eddb3fd768237ea42e
@@ -1,10 +1,11 @@ LICENSE = "GPLv2"
 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 @@ EXTRA_OECONF = ""
 
 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
 }