[SCM] gnome-mplayer/master: Fix build failure with hardening flags enabled.

sramacher-guest at users.alioth.debian.org sramacher-guest at users.alioth.debian.org
Sun Apr 29 17:26:08 UTC 2012


The following commit has been merged in the master branch:
commit 38953cb3c4d645907efca79550c68611dac98474
Author: Sebastian Ramacher <s.ramacher at gmx.at>
Date:   Sun Apr 29 19:09:32 2012 +0200

    Fix build failure with hardening flags enabled.

diff --git a/debian/changelog b/debian/changelog
index d9554fe..3ebc00f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,10 @@ gnome-mplayer (1.0.6-1) UNRELEASED; urgency=low
     - Bump Build-Dep on libgmtk-dev to >= 1.0.6.
     - Bump Build-Dep on debhelper to >= 9.
   * debian/compat: Bump compat to 9 to get hardening build flags.
+  * debian/patches: Add fix-errors-with-hardening-flags.patch to fix build
+    error with hardening flags enabled.
 
- -- Sebastian Ramacher <s.ramacher at gmx.at>  Sun, 29 Apr 2012 18:51:20 +0200
+ -- Sebastian Ramacher <s.ramacher at gmx.at>  Sun, 29 Apr 2012 19:08:49 +0200
 
 gnome-mplayer (1.0.5-1) unstable; urgency=low
 
diff --git a/debian/patches/fix-errors-with-hardening-flags.patch b/debian/patches/fix-errors-with-hardening-flags.patch
new file mode 100644
index 0000000..ceb450d
--- /dev/null
+++ b/debian/patches/fix-errors-with-hardening-flags.patch
@@ -0,0 +1,17 @@
+Description: Fix error with hardening buildflags enabled
+Author: Sebastian Ramacher <s.ramacher at gmx.at>
+Last-Update: 2012-04-29
+
+diff --git a/src/support.c b/src/support.c
+index b369d2a..3ea6528 100644
+--- a/src/support.c
++++ b/src/support.c
+@@ -885,7 +885,7 @@ gint parse_vcd(gchar * filename)
+ 
+         if (error_msg != NULL) {
+             dialog = gtk_message_dialog_new(NULL, GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_ERROR,
+-                                            GTK_BUTTONS_CLOSE, error_msg);
++                                            GTK_BUTTONS_CLOSE, "%s", error_msg);
+             gtk_window_set_title(GTK_WINDOW(dialog), _("GNOME MPlayer Error"));
+             gtk_dialog_run(GTK_DIALOG(dialog));
+             gtk_widget_destroy(dialog);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..34be7f8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix-errors-with-hardening-flags.patch

-- 
gnome-mplayer packaging



More information about the pkg-multimedia-commits mailing list