summaryrefslogtreecommitdiffstats
path: root/source/xap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2024-04-08 18:44:37 +0000
committer Eric Hameleers <alien@slackware.com>2024-04-08 21:32:38 +0200
commitc302fc308cc0658407100980f5b285b064d6b777 (patch)
treee9887c89cf6cb2f1367d76202c58e8f5816ee295 /source/xap
parentff9f5e9d286181e257a3bbe02d314ca62bd2a081 (diff)
downloadcurrent-c302fc308cc0658407100980f5b285b064d6b777.tar.gz
current-c302fc308cc0658407100980f5b285b064d6b777.tar.xz
Mon Apr 8 18:44:37 UTC 202420240408184437
l/imagemagick-7.1.1_30-x86_64-1.txz: Upgraded. l/libarchive-3.7.3-x86_64-1.txz: Upgraded. This update fixes a security issue: Fix possible vulnerability in tar error reporting introduced in f27c173 by JiaT75. For more information, see: https://github.com/libarchive/libarchive/commit/f27c173d17dc807733b3a4f8c11207c3f04ff34f https://github.com/libarchive/libarchive/pull/2101 (* Security fix *) n/net-snmp-5.9.4-x86_64-3.txz: Rebuilt. [PATCH] Add Linux 6.7 compatibility parsing /proc/net/snmp. Thanks to walecha. n/rsync-3.3.0-x86_64-1.txz: Upgraded. x/xorg-sgml-doctools-1.12.1-x86_64-1.txz: Upgraded. xap/gimp-2.10.36-x86_64-3.txz: Rebuilt. [PATCH] QuitDialog: disconnect signal handler on dialog destroy. This fixes a crash on quit. Thanks to USUARIONUEVO. xap/xlockmore-5.77-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap')
-rw-r--r--source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch28
-rwxr-xr-xsource/xap/gimp/gimp.SlackBuild7
2 files changed, 33 insertions, 2 deletions
diff --git a/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch b/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch
new file mode 100644
index 000000000..615e77608
--- /dev/null
+++ b/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch
@@ -0,0 +1,28 @@
+From 0a67fb0484001e7a0bf14eb73c67f9e74325d524 Mon Sep 17 00:00:00 2001
+From: Luca Bacci <luca.bacci982@gmail.com>
+Date: Tue, 2 Apr 2024 11:31:08 +0200
+Subject: [PATCH] QuitDialog: disconnect signal handler on dialog destroy
+
+...rather than finalize.
+
+Fixes #10785
+---
+ app/dialogs/quit-dialog.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/app/dialogs/quit-dialog.c b/app/dialogs/quit-dialog.c
+index 11737f9ad51..435ea4961a3 100644
+--- a/app/dialogs/quit-dialog.c
++++ b/app/dialogs/quit-dialog.c
+@@ -273,7 +273,7 @@ quit_close_all_dialog_new (Gimp *gimp,
+
+ closure = g_cclosure_new (G_CALLBACK (quit_close_all_dialog_container_changed),
+ private, NULL);
+- g_object_watch_closure (G_OBJECT (private->dialog), closure);
++ g_signal_connect_swapped (private->dialog, "destroy", G_CALLBACK (g_closure_invalidate), closure);
+ g_signal_connect_closure (private->images, "add", closure, FALSE);
+ g_signal_connect_closure (private->images, "remove", closure, FALSE);
+
+--
+GitLab
+
diff --git a/source/xap/gimp/gimp.SlackBuild b/source/xap/gimp/gimp.SlackBuild
index 85167c90b..f4590d257 100755
--- a/source/xap/gimp/gimp.SlackBuild
+++ b/source/xap/gimp/gimp.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2011, 2015, 2018, 2020 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2015, 2018, 2020, 2024 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=gimp
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -77,6 +77,9 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
+# Patch for recent glib:
+cat $CWD/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch | patch -p1 --verbose || exit 1
+
CFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \