Date: Wednesday, December 28, 2022 @ 20:55:48
Author: foutrelis
Revision: 1371828
upgpkg: handbrake 1.6.0-1
Added:
handbrake/trunk/fix-build-with-Werror-format-security.patch
Modified:
handbrake/trunk/PKGBUILD
---------------------------------------------+
PKGBUILD | 22 +++++----
fix-build-with-Werror-format-security.patch | 61 ++++++++++++++++++++++++++
2 files changed, 74 insertions(+), 9 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-12-28 19:53:28 UTC (rev 1371827)
+++ PKGBUILD 2022-12-28 20:55:48 UTC (rev 1371828)
@@ -3,8 +3,8 @@
# Contributor: Sebastien Piccand <sebcactus gmail com>
pkgname=('handbrake' 'handbrake-cli')
-pkgver=1.5.1
-pkgrel=2
+pkgver=1.6.0
+pkgrel=1
arch=('x86_64')
url="https://handbrake.fr/";
license=('GPL')
@@ -15,17 +15,21 @@
makedepends=('intltool' 'python' 'nasm' 'wget' 'cmake' 'meson'
"${_commondeps[@]}" "${_guideps[@]}")
options=('!lto') # https://bugs.archlinux.org/task/72600
-source=(https://github.com/HandBrake/HandBrake/releases/download/$pkgver/HandBrake-$pkgver-source.tar.bz2{,.sig})
-sha256sums=('3999fe06d5309c819799a73a968a8ec3840e7840c2b64af8f5cdb7fd8c9430f0'
- 'SKIP')
+source=(https://github.com/HandBrake/HandBrake/releases/download/$pkgver/HandBrake-$pkgver-source.tar.bz2{,.sig}
+ fix-build-with-Werror-format-security.patch)
+sha256sums=('7f23c76038b7bf329089d0eb33c14898400fcc0426e310e87dc11e538c103cda'
+ 'SKIP'
+ '9e46ab5c9539bd0910780f38131097c4e3871acde70c89a92abfc8edc9ec2c21')
validpgpkeys+=('1629C061B3DDE7EB4AE34B81021DB8B44E4A8645') # HandBrake Team
<[email protected]>
prepare() {
- cd "$srcdir/HandBrake-$pkgver"
+ cd HandBrake-$pkgver
+ # https://github.com/HandBrake/HandBrake/pull/4761
+ patch -Np1 -i ../fix-build-with-Werror-format-security.patch
}
build() {
- cd "$srcdir/HandBrake-$pkgver"
+ cd HandBrake-$pkgver
./configure \
--prefix=/usr \
@@ -42,7 +46,7 @@
'intel-media-sdk: Intel QuickSync support'
'libdvdcss: for decoding encrypted DVDs')
- cd "$srcdir/HandBrake-$pkgver/build"
+ cd HandBrake-$pkgver/build
make DESTDIR="$pkgdir" install
rm "$pkgdir/usr/bin/HandBrakeCLI"
@@ -54,7 +58,7 @@
optdepends=('intel-media-sdk: Intel QuickSync support'
'libdvdcss: for decoding encrypted DVDs')
- cd "$srcdir/HandBrake-$pkgver/build"
+ cd HandBrake-$pkgver/build
install -D HandBrakeCLI "$pkgdir/usr/bin/HandBrakeCLI"
}
Added: fix-build-with-Werror-format-security.patch
===================================================================
--- fix-build-with-Werror-format-security.patch (rev 0)
+++ fix-build-with-Werror-format-security.patch 2022-12-28 20:55:48 UTC (rev
1371828)
@@ -0,0 +1,61 @@
+From 4d8f5fe1c4b29edfbcc77e4774378e05b38688db Mon Sep 17 00:00:00 2001
+From: Evangelos Foutras <[email protected]>
+Date: Wed, 28 Dec 2022 22:23:50 +0200
+Subject: [PATCH] LinGUI: fix build with -Werror=format-security
+
+Add missing format strings where needed.
+
+Fixes: f6c0971c0042 ("Added XDG color-scheme implementation")
+Fixes: 3c71841d7716 ("LinGUI: Add warning color to dialog buttons")
+Fixes: 23f067ef4186 ("LinGUI: Add subtitle and audio track names to queue")
+---
+ gtk/src/callbacks.c | 2 +-
+ gtk/src/color-scheme.c | 2 +-
+ gtk/src/queuehandler.c | 4 ++--
+ 3 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
+index d815e10e2..eed9a4510 100644
+--- a/gtk/src/callbacks.c
++++ b/gtk/src/callbacks.c
+@@ -3790,7 +3790,7 @@ ghb_title_message_dialog(GtkWindow *parent,
GtkMessageType type, const gchar *ti
+ type, GTK_BUTTONS_NONE,
+ "%s", title);
+ if (message)
+- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
message);
++ gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
"%s", message);
+
+ gtk_dialog_add_buttons(GTK_DIALOG(dialog),
+ no, GTK_RESPONSE_NO,
+diff --git a/gtk/src/color-scheme.c b/gtk/src/color-scheme.c
+index 6fbf65e71..0816d6808 100644
+--- a/gtk/src/color-scheme.c
++++ b/gtk/src/color-scheme.c
+@@ -173,7 +173,7 @@ DesktopColorScheme color_scheme_get_desktop_scheme (void)
+ DBUS_TIMEOUT, NULL, &error);
+ if (!result)
+ {
+- g_debug(error->message);
++ g_debug("%s", error->message);
+ return DESKTOP_NO_PREFERENCE;
+ }
+
+diff --git a/gtk/src/queuehandler.c b/gtk/src/queuehandler.c
+index db186fbe3..a2b3e96aa 100644
+--- a/gtk/src/queuehandler.c
++++ b/gtk/src/queuehandler.c
+@@ -682,12 +682,12 @@ queue_update_summary(GhbValue * queueDict,
signal_user_data_t *ud)
+ def = ghb_dict_get_bool(subsettings, "Default");
+ name = ghb_dict_get_string(subsettings, "Name");
+
+- g_string_append_printf(str, sep);
++ g_string_append_printf(str, "%s", sep);
+ if (name)
+ {
+ g_string_append_printf(str, "%s - ", name);
+ }
+- g_string_append_printf(str, desc);
++ g_string_append_printf(str, "%s", desc);
+ free(desc);
+ if (force)
+ {
