diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2024-05-03 17:37:59 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2024-05-03 20:00:12 +0200 |
| commit | 7a91946d5aa08f55eccc889c13b210621582757a (patch) | |
| tree | 89de1316e46c04ec9ac7d35a26bf19e048590adb /source | |
| parent | 43fb31f23b01aa82717afad314b5b22a3067fb27 (diff) | |
| download | current-7a91946d5aa08f55eccc889c13b210621582757a.tar.gz current-7a91946d5aa08f55eccc889c13b210621582757a.tar.xz | |
Fri May 3 17:37:59 UTC 202420240503173759
a/hwdata-0.382-noarch-1.txz: Upgraded.
a/ndctl-79-x86_64-1.txz: Upgraded.
l/gtk4-4.14.4-x86_64-1.txz: Upgraded.
xap/gimp-2.10.38-x86_64-1.txz: Upgraded.
Diffstat (limited to '')
| -rwxr-xr-x | source/ap/mariadb/mariadb.SlackBuild | 7 | ||||
| -rw-r--r-- | source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch | 28 | ||||
| -rwxr-xr-x | source/xap/gimp/gimp.SlackBuild | 5 |
3 files changed, 3 insertions, 37 deletions
diff --git a/source/ap/mariadb/mariadb.SlackBuild b/source/ap/mariadb/mariadb.SlackBuild index 8a3494e89..bb563e246 100755 --- a/source/ap/mariadb/mariadb.SlackBuild +++ b/source/ap/mariadb/mariadb.SlackBuild @@ -202,11 +202,8 @@ chmod 0755 $PKG/var/run/mysql # Add init script: mkdir -p $PKG/etc/rc.d # This is installed chmod 644 so that the server does not run by default. -cp -a $CWD/rc.mysqld.gz $PKG/etc/rc.d/rc.mysqld.gz -gzip -d $PKG/etc/rc.d/rc.mysqld.gz -mv $PKG/etc/rc.d/rc.mysqld $PKG/etc/rc.d/rc.mysqld.new -chown root:root $PKG/etc/rc.d/rc.mysqld.new -chmod 644 $PKG/etc/rc.d/rc.mysqld.new +zcat $CWD/rc.mysqld.gz > $PKG/etc/rc.d/rc.mysqld.new +touch -r $CWD/rc.mysqld.gz $PKG/etc/rc.d/rc.mysqld.new rm -rf $PKG/etc/init.d $PKG/usr/libexec/rcmysql # Install mysqlaccess.conf diff --git a/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch b/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch deleted file mode 100644 index 615e77608..000000000 --- a/source/xap/gimp/0a67fb0484001e7a0bf14eb73c67f9e74325d524.patch +++ /dev/null @@ -1,28 +0,0 @@ -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 f4590d257..3c54f1cd9 100755 --- a/source/xap/gimp/gimp.SlackBuild +++ b/source/xap/gimp/gimp.SlackBuild @@ -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:-3} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -77,9 +77,6 @@ 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 \ |