From c1b55cfd23285ae9eb391035add5047018d0757d Mon Sep 17 00:00:00 2001 From: Adrian Bunk Date: Wed, 8 May 2019 00:44:14 +0300 Subject: 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 --- ...se-foreign-mode-to-avoid-errors-with-miss.patch | 29 ---------------------- ...vRTF.c-Specify-print-format-in-rtf_output.patch | 26 ------------------- .../recipes-gnome/wv/wv-1.2.4/pkgconfig.patch | 13 ---------- ...se-foreign-mode-to-avoid-errors-with-miss.patch | 29 ++++++++++++++++++++++ ...vRTF.c-Specify-print-format-in-rtf_output.patch | 26 +++++++++++++++++++ meta-gnome/recipes-gnome/wv/wv_1.2.4.bb | 19 -------------- meta-gnome/recipes-gnome/wv/wv_1.2.9.bb | 18 ++++++++++++++ 7 files changed, 73 insertions(+), 87 deletions(-) delete mode 100644 meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch delete mode 100644 meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch delete mode 100644 meta-gnome/recipes-gnome/wv/wv-1.2.4/pkgconfig.patch create mode 100644 meta-gnome/recipes-gnome/wv/wv/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch create mode 100644 meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch delete mode 100644 meta-gnome/recipes-gnome/wv/wv_1.2.4.bb create mode 100644 meta-gnome/recipes-gnome/wv/wv_1.2.9.bb 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 deleted file mode 100644 index a8c5bc7968..0000000000 --- a/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch +++ /dev/null @@ -1,29 +0,0 @@ -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/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch b/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch deleted file mode 100644 index 2fc3f367fa..0000000000 --- a/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 079529b8d5e339e2211fa2f8c15543a738a627bc Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Tue, 27 Jun 2017 14:50:51 -0700 -Subject: [PATCH] wvRTF.c: Specify print format in rtf_output() - -Signed-off-by: Khem Raj ---- - wvRTF.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wvRTF.c b/wvRTF.c -index 361d258..4f24b30 100644 ---- a/wvRTF.c -+++ b/wvRTF.c -@@ -192,7 +192,7 @@ output_rtfUserData (rtfUserData * ud) - rtf_output_char ('{'); - - /* font color */ -- rtf_output (rtfColors[ud->cCol]); -+ rtf_output ("%s", rtfColors[ud->cCol]); - - /* font face */ - rtf_output ("\\f%d", ud->cFont); --- -2.13.2 - 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/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 new file mode 100644 index 0000000000..a8c5bc7968 --- /dev/null +++ b/meta-gnome/recipes-gnome/wv/wv/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/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 new file mode 100644 index 0000000000..2fc3f367fa --- /dev/null +++ b/meta-gnome/recipes-gnome/wv/wv/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch @@ -0,0 +1,26 @@ +From 079529b8d5e339e2211fa2f8c15543a738a627bc Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 27 Jun 2017 14:50:51 -0700 +Subject: [PATCH] wvRTF.c: Specify print format in rtf_output() + +Signed-off-by: Khem Raj +--- + wvRTF.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/wvRTF.c b/wvRTF.c +index 361d258..4f24b30 100644 +--- a/wvRTF.c ++++ b/wvRTF.c +@@ -192,7 +192,7 @@ output_rtfUserData (rtfUserData * ud) + rtf_output_char ('{'); + + /* font color */ +- rtf_output (rtfColors[ud->cCol]); ++ rtf_output ("%s", rtfColors[ud->cCol]); + + /* font face */ + rtf_output ("\\f%d", ud->cFont); +-- +2.13.2 + diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb deleted file mode 100644 index 03ee5b4ac4..0000000000 --- a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb +++ /dev/null @@ -1,19 +0,0 @@ -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 \ - file://0001-wvRTF.c-Specify-print-format-in-rtf_output.patch \ - " - -SRC_URI[md5sum] = "c1861c560491f121e12917fa76970ac5" -SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6" - -inherit autotools pkgconfig - -EXTRA_OECONF = "" diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb new file mode 100644 index 0000000000..72b8508a29 --- /dev/null +++ b/meta-gnome/recipes-gnome/wv/wv_1.2.9.bb @@ -0,0 +1,18 @@ +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 = "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] = "dbccf2e9f747e50c913b7e3d126b73f7" +SRC_URI[sha256sum] = "4c730d3b325c0785450dd3a043eeb53e1518598c4f41f155558385dd2635c19d" + +inherit autotools pkgconfig + +EXTRA_OECONF = "" -- cgit 1.2.3-korg