Fix building with -Werror=format-security, bug #521022

(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0xB3312CFDCF34A31F!)

3 files changed, 63 insertions, 14 deletions

diff --git a/app-editors/leafpad/ChangeLog b/app-editors/leafpad/ChangeLog
index 8d185d45e9a3..4ae49ad1419d 100644
--- a/app-editors/leafpad/ChangeLog
+++ b/app-editors/leafpad/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-editors/leafpad
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/ChangeLog,v 1.33 2012/09/13 21:14:54 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/ChangeLog,v 1.34 2014/09/13 21:53:07 tristan Exp $
+
+  13 Sep 2014; Tristan Heaven <tristan@gentoo.org> leafpad-0.8.18.1.ebuild,
+  +files/leafpad-0.8.18.1-format-security.patch:
+  Fix building with -Werror=format-security, bug #521022
 
   13 Sep 2012; Samuli Suominen <ssuominen@gentoo.org> leafpad-0.8.18.1.ebuild,
   +files/leafpad-0.8.18.1-fdo.patch:
diff --git a/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch b/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
new file mode 100644
index 000000000000..07f1e2ee111d
--- /dev/null
+++ b/app-editors/leafpad/files/leafpad-0.8.18.1-format-security.patch
@@ -0,0 +1,30 @@
+- dialog.c:39:3: error: format not a string literal and no format arguments [-Werror=format-security]
+
+--- src/dialog.c
++++ src/dialog.c
+@@ -36,6 +36,7 @@
+ 		GTK_DIALOG_DESTROY_WITH_PARENT,
+ 		type,
+ 		GTK_BUTTONS_NONE,
++		"%s",
+ 		str);
+ 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+ 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+@@ -61,6 +62,7 @@
+ 		GTK_DIALOG_DESTROY_WITH_PARENT,
+ 		GTK_MESSAGE_QUESTION,
+ 		GTK_BUTTONS_NONE,
++		"%s",
+ 		str);
+ 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+ 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+--- src/gtkprint.c
++++ src/gtkprint.c
+@@ -165,6 +165,7 @@
+ 		GTK_DIALOG_DESTROY_WITH_PARENT,
+ 		GTK_MESSAGE_ERROR,
+ 		GTK_BUTTONS_NONE,
++		"%s",
+ 		message);
+ 	gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE);
+ 	gtk_dialog_add_buttons(GTK_DIALOG(dialog),
diff --git a/app-editors/leafpad/leafpad-0.8.18.1.ebuild b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
index a74d57ceffd4..bbaab06e8ea4 100644
--- a/app-editors/leafpad/leafpad-0.8.18.1.ebuild
+++ b/app-editors/leafpad/leafpad-0.8.18.1.ebuild
@@ -1,18 +1,18 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/leafpad-0.8.18.1.ebuild,v 1.5 2012/09/13 21:14:54 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-editors/leafpad/leafpad-0.8.18.1.ebuild,v 1.6 2014/09/13 21:53:07 tristan Exp $
 
-EAPI=4
+EAPI=5
 inherit eutils fdo-mime gnome2-utils
 
-DESCRIPTION="Legacy (stable) release of the GTK+ 2.x based codebase"
+DESCRIPTION="A simple GTK2 text editor"
 HOMEPAGE="http://tarot.freeshell.org/leafpad/"
 SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
 
-LICENSE=GPL-2
-SLOT=0
+LICENSE="GPL-2"
+SLOT="0"
 KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~x86-interix ~amd64-linux ~x86-linux"
-IUSE=emacs
+IUSE="emacs"
 
 RDEPEND="virtual/libintl
 	x11-libs/gtk+:2"
@@ -24,13 +24,28 @@ DEPEND="${RDEPEND}
 DOCS="AUTHORS ChangeLog NEWS README"
 
 src_prepare() {
-	epatch "${FILESDIR}"/${P}-fdo.patch
+	epatch \
+		"${FILESDIR}"/${P}-fdo.patch \
+		"${FILESDIR}"/${P}-format-security.patch
 }
 
 src_configure() {
-	econf --enable-chooser --enable-print $(use_enable emacs)
+	econf \
+		--enable-chooser \
+		--enable-print \
+		$(use_enable emacs)
 }
 
-pkg_preinst() { gnome2_icon_savelist; }
-pkg_postinst() { fdo-mime_desktop_database_update; gnome2_icon_cache_update; }
-pkg_postrm() { fdo-mime_desktop_database_update; gnome2_icon_cache_update; }
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}