summaryrefslogtreecommitdiffstats
path: root/meta-gnome
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2017-06-27 19:08:17 -0700
committerArmin Kuster <akuster808@gmail.com>2017-09-13 17:16:28 -0700
commit7028bac9ed4463c893be079cb1997f156b5ed5eb (patch)
tree43088e8ae19c01a25803a22ef7d48251b82a0b8f /meta-gnome
parent693c3acaa749d1eb38005a23efcdc31f02e6348e (diff)
downloadmeta-openembedded-7028bac9ed4463c893be079cb1997f156b5ed5eb.tar.gz
wv: Fix build with hardening flags
Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-gnome')
-rw-r--r--meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch26
-rw-r--r--meta-gnome/recipes-gnome/wv/wv_1.2.4.bb3
2 files changed, 28 insertions, 1 deletions
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
new file mode 100644
index 000000000..2fc3f367f
--- /dev/null
+++ b/meta-gnome/recipes-gnome/wv/wv-1.2.4/0001-wvRTF.c-Specify-print-format-in-rtf_output.patch
@@ -0,0 +1,26 @@
1From 079529b8d5e339e2211fa2f8c15543a738a627bc Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 27 Jun 2017 14:50:51 -0700
4Subject: [PATCH] wvRTF.c: Specify print format in rtf_output()
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 wvRTF.c | 2 +-
9 1 file changed, 1 insertion(+), 1 deletion(-)
10
11diff --git a/wvRTF.c b/wvRTF.c
12index 361d258..4f24b30 100644
13--- a/wvRTF.c
14+++ b/wvRTF.c
15@@ -192,7 +192,7 @@ output_rtfUserData (rtfUserData * ud)
16 rtf_output_char ('{');
17
18 /* font color */
19- rtf_output (rtfColors[ud->cCol]);
20+ rtf_output ("%s", rtfColors[ud->cCol]);
21
22 /* font face */
23 rtf_output ("\\f%d", ud->cFont);
24--
252.13.2
26
diff --git a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
index 6489c6f19..8ed1fcd15 100644
--- a/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
+++ b/meta-gnome/recipes-gnome/wv/wv_1.2.4.bb
@@ -8,7 +8,8 @@ DEPENDS = "libgsf glib-2.0 libpng"
8SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/wvware/wv-${PV}.tar.gz \
9 file://pkgconfig.patch \ 9 file://pkgconfig.patch \
10 file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \ 10 file://0001-configure-use-foreign-mode-to-avoid-errors-with-miss.patch \
11 " 11 file://0001-wvRTF.c-Specify-print-format-in-rtf_output.patch \
12 "
12 13
13SRC_URI[md5sum] = "c1861c560491f121e12917fa76970ac5" 14SRC_URI[md5sum] = "c1861c560491f121e12917fa76970ac5"
14SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6" 15SRC_URI[sha256sum] = "673109910e22d4cf94cc8be4dcb9a0c41b5fbdb1736d4b7bdc7778894d57c2d6"