From c1b55cfd23285ae9eb391035add5047018d0757d Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 8 May 2019 00:44:14 +0300 Subject: [PATCH] wv: upgrade 1.2.4 -> 1.2.9 The upstream location has changed. Remove a patch for an issue fixed upstream. Signed-off-by: Adrian Bunk Signed-off-by: Khem Raj --- .../recipes-gnome/wv/wv-1.2.4/pkgconfig.patch | 13 ------------- ...use-foreign-mode-to-avoid-errors-with-miss.patch | 0 ...wvRTF.c-Specify-print-format-in-rtf_output.patch | 0 .../recipes-gnome/wv/{wv_1.2.4.bb => wv_1.2.9.bb} | 7 +++---- 4 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch rename meta-gnome/recipes-gnome/wv/{wv-1.2.4 => wv}/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch (100%) rename meta-gnome/recipes-gnome/wv/{wv-1.2.4 => wv}/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch (100%) rename meta-gnome/recipes-gnome/wv/{wv_1.2.4.bb => wv_1.2.9.bb} (65%) 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 deleted file mode 100644 index 136d89341f..0000000000 --- a/meta-gnome/recipes-gnome/wv/wv-1.2.4/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/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch similarity index 100% rename from meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch rename to meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch diff --git a/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch b/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch similarity index 100% rename from meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch rename to meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb similarity index 65% rename from meta-gnome/recipes-gnome/wv/wv_1.2.4.bb rename to meta-gnome/recipes-gnome/wv/wv_1.2.9.bb index 03ee5b4ac4..72b8508a29 100644 --- a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb +++ b/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb @@ -5,14 +5,13 @@ 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 \ +SRC_URI = "https://www.abisource.com/downloads/wv/${PV}/${BP}.tar.gz \ file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \ file://0001-wvRTF.c-Specify-print-format-in-rtf_output.patch \ " -SRC_URI[md5sum] = "c1861c560491f121e12917fa76970ac5" -SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6" +SRC_URI[md5sum] = "dbccf2e9f747e50c913b7e3d126b73f7" +SRC_URI[sha256sum] = "4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d" inherit autotools pkgconfig