From 44dfd025fda195574697218a31db4e7bfea7345e Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Fri, 23 May 2014 11:23:47 +0200 Subject: [PATCH] Fix the build with -Werror=format-security --- ...x-the-build-with-Werror-format-secur.patch | 25 +++++++++++++++++++ gtk2.spec | 4 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 0001-pixbuf-engine-Fix-the-build-with-Werror-format-secur.patch diff --git a/0001-pixbuf-engine-Fix-the-build-with-Werror-format-secur.patch b/0001-pixbuf-engine-Fix-the-build-with-Werror-format-secur.patch new file mode 100644 index 0000000..58b4932 --- /dev/null +++ b/0001-pixbuf-engine-Fix-the-build-with-Werror-format-secur.patch @@ -0,0 +1,25 @@ +From 46b0c2938293b0495f65a46fdc632b788532639b Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Fri, 23 May 2014 11:19:53 +0200 +Subject: [PATCH] pixbuf-engine: Fix the build with -Werror=format-security + +--- + modules/engines/pixbuf/pixbuf-rc-style.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/engines/pixbuf/pixbuf-rc-style.c b/modules/engines/pixbuf/pixbuf-rc-style.c +index 4b86e4f..18851e3 100644 +--- a/modules/engines/pixbuf/pixbuf-rc-style.c ++++ b/modules/engines/pixbuf/pixbuf-rc-style.c +@@ -669,7 +669,7 @@ clear_theme_pixbuf_and_warn (ThemePixbuf **theme_pb, + const char *message) + { + theme_clear_pixbuf (theme_pb); +- g_scanner_warn (scanner, message); ++ g_scanner_warn (scanner, "%s", message); + } + + static guint +-- +1.9.3 + diff --git a/gtk2.spec b/gtk2.spec index 0a4cbd3..acc904e 100644 --- a/gtk2.spec +++ b/gtk2.spec @@ -35,7 +35,8 @@ Patch2: icon-padding.patch Patch8: tooltip-positioning.patch # https://bugzilla.gnome.org/show_bug.cgi?id=611313 Patch15: window-dragging.patch -# https://bugzilla.redhat.com/show_bug.cgi?id=973730 +# Backported from upstream +Patch16: 0001-pixbuf-engine-Fix-the-build-with-Werror-format-secur.patch BuildRequires: atk-devel >= %{atk_version} BuildRequires: glib2-devel >= %{glib2_version} @@ -147,6 +148,7 @@ This package contains developer documentation for the GTK+ widget toolkit. %patch2 -p1 -b .icon-padding %patch8 -p1 -b .tooltip-positioning %patch15 -p1 -b .window-dragging +%patch16 -p1 -b .format_security %build (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;