From 1f24900e8613e6ac00558afb282d0c1ef0ea81eb Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 1 Aug 2014 15:34:52 +0200 Subject: wv: update to 1.2.4 Also fix automake foreign problems. Signed-off-by: Koen Kooi Signed-off-by: Martin Jansa --- .../recipes-gnome/wv/wv-1.2.0/pkgconfig.patch | 13 ---------- ...se-foreign-mode-to-avoid-errors-with-miss.patch | 29 ++++++++++++++++++++++ .../recipes-gnome/wv/wv-1.2.4/pkgconfig.patch | 13 ++++++++++ meta-gnome/recipes-gnome/wv/wv_1.2.0.bb | 20 --------------- meta-gnome/recipes-gnome/wv/wv_1.2.4.bb | 20 +++++++++++++++ 5 files changed, 62 insertions(+), 33 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch create mode 100644 meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch create mode 100644 meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch delete mode 100644 meta-gnome/recipes-gnome/wv/wv_1.2.0.bb create mode 100644 meta-gnome/recipes-gnome/wv/wv_1.2.4.bb (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch b/meta-gnome/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch deleted file mode 100644 index 136d89341f..0000000000 --- a/meta-gnome/recipes-gnome/wv/wv-1.2.0/pkgconfig.patch +++ /dev/null @@ -1,13 +0,0 @@ -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/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch b/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch new file mode 100644 index 0000000000..a8c5bc7968 --- /dev/null +++ b/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch @@ -0,0 +1,29 @@ +From eebe1f27f4b27b05eb4b9b55f9df1124acf4d092 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Fri, 1 Aug 2014 12:25:24 +0200 +Subject: [PATCH] configure: use 'foreign' mode to avoid errors with missing + NEWS/AUTHORS/etc + +Upstream-status: Pending + +Signed-off-by: Koen Kooi +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 3d7eef6..1784bdd 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -41,7 +41,7 @@ VERSION=$WV_VERSION + PACKAGE=wv + + dnl Initialize automake stuff +-AM_INIT_AUTOMAKE($PACKAGE, $VERSION) ++AM_INIT_AUTOMAKE([foreign]) + + # Specify a configuration file + AM_CONFIG_HEADER(config.h) +-- +1.9.0 + diff --git a/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch b/meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch new file mode 100644 index 0000000000..136d89341f --- /dev/null +++ b/meta-gnome/recipes-gnome/wv/wv-1.2.4/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/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb deleted file mode 100644 index c12569672c..0000000000 --- a/meta-gnome/recipes-gnome/wv/wv_1.2.0.bb +++ /dev/null @@ -1,20 +0,0 @@ -SUMMARY = "Programs for accessing Microsoft Word documents" -HOMEPAGE = "http://wvware.sourceforge.net/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f" - -PNBLACKLIST[wv] = "BROKEN: depends on broken libgsf" - -DEPENDS = "libgsf glib-2.0 libpng" -PR = "r5" - -SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ - file://pkgconfig.patch" -SRC_URI[md5sum] = "b6319d5e75611fe2210453b5feb82c0c" -SRC_URI[sha256sum] = "a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4" - -inherit autotools pkgconfig - -S = "${WORKDIR}/${PN}-${PV}" - -EXTRA_OECONF = "" diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb new file mode 100644 index 0000000000..6489c6f19f --- /dev/null +++ b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb @@ -0,0 +1,20 @@ +SUMMARY = "Programs for accessing Microsoft Word documents" +HOMEPAGE = "http://wvware.sourceforge.net/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=6cbca01f1c9178aca280e8ff64d85b2f" + +DEPENDS = "libgsf glib-2.0 libpng" + +SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ + file://pkgconfig.patch \ + file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \ + " + +SRC_URI[md5sum] = "c1861c560491f121e12917fa76970ac5" +SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6" + +inherit autotools pkgconfig + +S = "${WORKDIR}/${PN}-${PV}" + +EXTRA_OECONF = "" -- cgit 1.2.3-korg