diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-04-08 14:29:28 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2008-04-08 14:29:28 +0000 |
| commit | db1a2e5e8b5cb007dc083061822236ed3656d5f6 (patch) | |
| tree | b84b20ed35abe86ce18dced8ba7a402000eb17c6 | |
| parent | ce9487cb7dfc40a43b957d025bc0936e81bdc17e (diff) | |
wv: Fix DEPENDS and pkgconfig file (from Poky)
| -rw-r--r-- | packages/wv/wv-1.2.0/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/wv/wv-1.2.0/pkgconfig.patch | 13 | ||||
| -rw-r--r-- | packages/wv/wv_1.2.0.bb | 12 |
3 files changed, 17 insertions, 8 deletions
diff --git a/packages/wv/wv-1.2.0/.mtn2git_empty b/packages/wv/wv-1.2.0/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/wv/wv-1.2.0/.mtn2git_empty diff --git a/packages/wv/wv-1.2.0/pkgconfig.patch b/packages/wv/wv-1.2.0/pkgconfig.patch new file mode 100644 index 0000000000..136d89341f --- /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 9e9e65fd49..7f06f587c4 100644 --- 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 } |