diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-08-26 11:35:19 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-09-13 17:16:28 -0700 |
commit | afefa867d87e2add9bb330881c9974f03f3a844c (patch) | |
tree | 352ee887c676528e30c7306761e1e86a2ef3a5e8 | |
parent | a2bd363d028729f7fab3dda5106e1f9a0d47e569 (diff) | |
download | meta-openembedded-contrib-afefa867d87e2add9bb330881c9974f03f3a844c.tar.gz |
gedit: Fix with with hardening flags and clang
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit 163aa96562955c38f5bcd9ebcb0151a0b87c1c40)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch | 31 | ||||
-rw-r--r-- | meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch b/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch new file mode 100644 index 0000000000..4885c45113 --- /dev/null +++ b/meta-gnome/recipes-gnome/gedit/files/0001-gedit-utils-qualify-handle_builder_error-with-format.patch @@ -0,0 +1,31 @@ +From 623ffac1f6e7725041b386e0f2933fe36809b5a9 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 26 Aug 2017 09:04:30 -0700 +Subject: [PATCH] gedit-utils: qualify handle_builder_error() with format + string parameters + +gedit-utils.c:1063:32: error: format string is not a string literal [-Werror,-Wformat-nonliteral] + msg_plain = g_strdup_vprintf (message, args); + ^~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gedit/gedit-utils.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/gedit/gedit-utils.c b/gedit/gedit-utils.c +index 41a5afd..c800828 100644 +--- a/gedit/gedit-utils.c ++++ b/gedit/gedit-utils.c +@@ -1051,7 +1051,7 @@ gedit_utils_is_valid_uri (const gchar *uri) + return TRUE; + } + +-static GtkWidget * ++static G_GNUC_PRINTF(1, 2) GtkWidget * + handle_builder_error (const gchar *message, ...) + { + GtkWidget *label; +-- +2.14.1 + diff --git a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb index 4352b5e112..5d244de642 100644 --- a/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb +++ b/meta-gnome/recipes-gnome/gedit/gedit_2.30.4.bb @@ -13,6 +13,7 @@ SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV} file://0001-Remove-help-directory-from-build.patch \ file://0002-suppress-string-format-literal-warning-to-fix-build-.patch \ file://0001-tests-document-saver.c-Define-ACCESSPERMS-if-not-def.patch \ + file://0001-gedit-utils-qualify-handle_builder_error-with-format.patch \ " SRC_URI[archive.md5sum] = "e1eecb0a92a1a363b3d375ec5ac0fb3b" SRC_URI[archive.sha256sum] = "a561fe3dd1d199baede1bd07c4ee65f06fc7c494dd4d3327117f04149a608e3c" |