[libgda] Fix FTBFS with -Werror=format-security
Kalev Lember
kalev at fedoraproject.org
Sat May 17 13:17:06 UTC 2014
commit d2f1a4c7600d22de2be03dc6d0e94a075cc51057
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sat May 17 14:41:25 2014 +0200
Fix FTBFS with -Werror=format-security
https://bugzilla.redhat.com/show_bug.cgi?id=1037160
0001-Markup-message-correction.patch | 29 +++++++++++++++++++++++++++++
libgda.spec | 5 +++++
2 files changed, 34 insertions(+), 0 deletions(-)
---
diff --git a/0001-Markup-message-correction.patch b/0001-Markup-message-correction.patch
new file mode 100644
index 0000000..81c7804
--- /dev/null
+++ b/0001-Markup-message-correction.patch
@@ -0,0 +1,29 @@
+From 68af249e1c36cbac2e39903b0fc357e3ad2bf1ee Mon Sep 17 00:00:00 2001
+From: Vivien Malerba <malerba at gnome-db.org>
+Date: Wed, 16 Apr 2014 14:59:50 +0200
+Subject: [PATCH] Markup message correction
+
+---
+ libgda-ui/demos/ddl_queries.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/libgda-ui/demos/ddl_queries.c b/libgda-ui/demos/ddl_queries.c
+index a47630f..4b29377 100644
+--- a/libgda-ui/demos/ddl_queries.c
++++ b/libgda-ui/demos/ddl_queries.c
+@@ -475,9 +475,9 @@ show_sql (G_GNUC_UNUSED GtkButton *button, DemoData *data)
+ else
+ msg = g_strdup_printf ("<b>SQL:</b>\n%s", sql);
+
+- dlg = gtk_message_dialog_new_with_markup (GTK_WINDOW (data->top_window),
+- GTK_DIALOG_MODAL,
+- msg_type, GTK_BUTTONS_CLOSE, msg);
++ dlg = gtk_message_dialog_new (GTK_WINDOW (data->top_window),
++ GTK_DIALOG_MODAL, msg_type, GTK_BUTTONS_CLOSE, NULL);
++ gtk_message_dialog_set_markup (GTK_MESSAGE_DIALOG (dlg), msg);
+ g_free (sql);
+ g_free (msg);
+
+--
+1.9.0
+
diff --git a/libgda.spec b/libgda.spec
index ee1e259..2e767c1 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -18,6 +18,9 @@ License: LGPLv2+
URL: http://www.gnome-db.org/
Source: http://ftp.gnome.org/pub/GNOME/sources/%{name}/5.2/%{name}-%{version}.tar.xz
+# Fix FTBFS with -Werror=format-security
+Patch0: 0001-Markup-message-correction.patch
+
BuildRequires: pkgconfig >= 0.8
BuildRequires: glib2-devel >= 2.28.0
BuildRequires: gtk3-devel >= 3.0.0
@@ -176,6 +179,7 @@ This %{name}-java includes the %{name} Java JDBC provider.
%prep
%setup -q
+%patch0 -p1
# AUTHORS not in UTF-8
iconv --from=ISO-8859-1 --to=UTF-8 AUTHORS > AUTHORS.new && \
@@ -385,6 +389,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%changelog
* Sat May 17 2014 Kalev Lember <kalevlember at gmail.com> - 1:5.2.2-1
- Update to 5.2.2
+- Fix FTBFS with -Werror=format-security (#1037160)
* Wed Apr 23 2014 Tomáš Mráz <tmraz at redhat.com> - 1:5.1.2-5
- Rebuild for new libgcrypt
More information about the scm-commits
mailing list