Date: Monday, December 12, 2022 @ 23:27:56 Author: eworm Revision: 464226
upgpkg: leafpad 0.8.19-2: properly fix format-security error Added: leafpad/trunk/0001-fix-format-security-error-from-gcc.patch Modified: leafpad/trunk/PKGBUILD -----------------------------------------------+ 0001-fix-format-security-error-from-gcc.patch | 53 ++++++++++++++++++++++++ PKGBUILD | 15 ++++-- 2 files changed, 64 insertions(+), 4 deletions(-) Added: 0001-fix-format-security-error-from-gcc.patch =================================================================== --- 0001-fix-format-security-error-from-gcc.patch (rev 0) +++ 0001-fix-format-security-error-from-gcc.patch 2022-12-12 23:27:56 UTC (rev 464226) @@ -0,0 +1,53 @@ +From a489f3678d5e037f44d4aa1e02b7eb30c9097666 Mon Sep 17 00:00:00 2001 +From: Christian Hesse <[email protected]> +Date: Tue, 13 Dec 2022 00:22:04 +0100 +Subject: [PATCH 1/1] fix format-security error from gcc + +Building with `-Werror=format-security` causes several of these errors: + +error: format not a string literal and no format arguments [-Werror=format-security] + +Let's fix by giving a proper format string. +--- + src/dialog.c | 4 ++-- + src/gtkprint.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/dialog.c b/src/dialog.c +index 14b69d7..5c4fe82 100644 +--- a/src/dialog.c ++++ b/src/dialog.c +@@ -36,7 +36,7 @@ void run_dialog_message(GtkWidget *window, + GTK_DIALOG_DESTROY_WITH_PARENT, + type, + GTK_BUTTONS_NONE, +- str); ++ "%s", str); + gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL); +@@ -61,7 +61,7 @@ GtkWidget *create_dialog_message_question(GtkWidget *window, gchar *message, ... + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_NONE, +- str); ++ "%s", str); + gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + GTK_STOCK_NO, GTK_RESPONSE_NO, +diff --git a/src/gtkprint.c b/src/gtkprint.c +index 3f39384..75e2f68 100644 +--- a/src/gtkprint.c ++++ b/src/gtkprint.c +@@ -165,7 +165,7 @@ static void create_error_dialog(GtkTextView *text_view, gchar *message) + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_ERROR, + GTK_BUTTONS_NONE, +- message); ++ "%s", message); + gtk_window_set_resizable(GTK_WINDOW(dialog), FALSE); + gtk_dialog_add_buttons(GTK_DIALOG(dialog), + GTK_STOCK_OK, GTK_RESPONSE_CANCEL, NULL); +-- +2.39.0 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-12-12 23:06:25 UTC (rev 464225) +++ PKGBUILD 2022-12-12 23:27:56 UTC (rev 464226) @@ -3,7 +3,7 @@ pkgname=leafpad pkgver=0.8.19 -pkgrel=1 +pkgrel=2 pkgdesc='A notepad clone for GTK+ 2.0' arch=('x86_64') url='http://tarot.freeshell.org/leafpad/' @@ -11,15 +11,22 @@ depends=('gtk2') makedepends=('intltool') validpgpkeys=('05B80A3FFAF8FED36ADC7A31EE109F4A0F184934') # Tarot Osuji <[email protected]> -source=("https://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig}) +source=("https://download.savannah.gnu.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz"{,.sig} + '0001-fix-format-security-error-from-gcc.patch') sha256sums=('07d3f712f4dbd0a33251fd1dee14e21afdc9f92090fc768c11ab0ac556adbe97' - 'SKIP') + 'SKIP' + '2b99426837e0a78077931e33bbfac280b238e0d170366c09e62bf98770e837dc') +prepare() { + cd "${srcdir}/${pkgname}-${pkgver}" + + patch -Np1 < ../0001-fix-format-security-error-from-gcc.patch +} + build() { cd "${srcdir}/${pkgname}-${pkgver}" ./configure \ - CFLAGS="${CFLAGS/-Werror=format-security/}" \ --prefix=/usr \ --enable-chooser make
