Sun Feb 25 19:16:52 UTC 202420240225191652

a/etc-15.1-x86_64-7.txz:  Rebuilt.
  Don't leave {group,gshadow,passwd,shadow}.new laying around.
  We'd left these as a reference in case new default entries were added so that
  the admin could take a look at them and merge the new entries into the
  existing files. But we've been merging them over automatically for quite some
  time. The files contain no unique information and are sort of a footbullet.
ap/qpdf-11.9.0-x86_64-1.txz:  Upgraded.
ap/vim-9.1.0136-x86_64-1.txz:  Upgraded.
n/whois-5.5.21-x86_64-1.txz:  Upgraded.
  Updated the .cv and .sd TLD servers.
  Removed 4 new gTLDs which are no longer active.
xap/vim-gvim-9.1.0136-x86_64-1.txz:  Upgraded.
xfce/xfce4-terminal-1.1.2-x86_64-2.txz:  Rebuilt.
  [PATCH] screen: Fix wrong assert.
  Thanks to J_W.
  [PATCH] prefs-dialog: Fix wrong assert.
  Thanks to mario.

5 files changed, 75 insertions, 4 deletions

diff --git a/source/a/etc/doinst.sh b/source/a/etc/doinst.sh
index f87f9c69e..18b53f333 100644
--- a/source/a/etc/doinst.sh
+++ b/source/a/etc/doinst.sh
@@ -80,10 +80,8 @@ rm -f etc/mtab.new
 rm -f etc/motd.new
 rm -f etc/ld.so.conf.new
 rm -f etc/hosts.new
-#rm -f etc/shadow.new
 rm -f etc/networks.new
 rm -f etc/HOSTNAME.new
-#rm -f etc/gshadow.new
 rm -f etc/shells.new
 rm -f etc/printcap.new
 #rm -f etc/issue.new
@@ -94,6 +92,14 @@ rm -f var/run/utmp.new
 rm -f var/log/lastlog.new
 rm -f var/log/wtmp.new
 
+# These are just a hazard to keep around, honestly.
+# There's no unique information in them anyway, as any new entries are merged
+# into the existing files automatically.
+rm -f etc/group.new
+rm -f etc/gshadow.new
+rm -f etc/passwd.new
+rm -f etc/shadow.new
+
 # Make sure $HOME is correct for user sddm:
 chroot . /usr/sbin/usermod -d /var/lib/sddm sddm > /dev/null 2> /dev/null
 # Make sure that sddm is a member of group video:
diff --git a/source/a/etc/etc.SlackBuild b/source/a/etc/etc.SlackBuild
index 90315a952..a21b99c6d 100755
--- a/source/a/etc/etc.SlackBuild
+++ b/source/a/etc/etc.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=etc
 VERSION=15.1
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
diff --git a/source/xfce/xfce4-terminal/177fda86451cdeaaea8ed409e6d711b670699a97.patch b/source/xfce/xfce4-terminal/177fda86451cdeaaea8ed409e6d711b670699a97.patch
new file mode 100644
index 000000000..d8074bde4
--- /dev/null
+++ b/source/xfce/xfce4-terminal/177fda86451cdeaaea8ed409e6d711b670699a97.patch
@@ -0,0 +1,32 @@
+From 177fda86451cdeaaea8ed409e6d711b670699a97 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Tue, 6 Feb 2024 18:14:04 +0100
+Subject: [PATCH] screen: Fix wrong assert
+
+It's always been wrong (or has been for a long time) but de3e7aac
+revealed it, because now it's no longer disabled by building with
+--disable-debug.
+
+Fixes: de3e7aac72fdcd3e62d69f37ec2570e5d668950a
+Closes: #299
+---
+ terminal/terminal-screen.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
+index 6e48b522..dc931ec7 100644
+--- a/terminal/terminal-screen.c
++++ b/terminal/terminal-screen.c
+@@ -1892,7 +1892,7 @@ terminal_screen_paste_unsafe_text (TerminalScreen *screen,
+ {
+   GtkWidget *dialog;
+ 
+-  g_return_if_fail (original_clipboard != GDK_SELECTION_CLIPBOARD && original_clipboard != GDK_SELECTION_PRIMARY);
++  g_return_if_fail (original_clipboard == GDK_SELECTION_CLIPBOARD || original_clipboard == GDK_SELECTION_PRIMARY);
+ 
+   dialog = terminal_screen_unsafe_paste_dialog_new (screen, text);
+   gtk_widget_show_all (dialog);
+-- 
+GitLab
+
+
diff --git a/source/xfce/xfce4-terminal/71ecd2a721b059394edcfb316a20ac9d46a7b2cd.patch b/source/xfce/xfce4-terminal/71ecd2a721b059394edcfb316a20ac9d46a7b2cd.patch
new file mode 100644
index 000000000..0f55ea5db
--- /dev/null
+++ b/source/xfce/xfce4-terminal/71ecd2a721b059394edcfb316a20ac9d46a7b2cd.patch
@@ -0,0 +1,29 @@
+From 71ecd2a721b059394edcfb316a20ac9d46a7b2cd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ga=C3=ABl=20Bonithon?= <gael@xfce.org>
+Date: Wed, 7 Feb 2024 16:10:05 +0100
+Subject: [PATCH] prefs-dialog: Fix wrong assert
+
+Related: #299
+Fixes: de3e7aac72fdcd3e62d69f37ec2570e5d668950a
+Closes: #300
+---
+ terminal/terminal-preferences-dialog.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/terminal/terminal-preferences-dialog.c b/terminal/terminal-preferences-dialog.c
+index 86950b45..a1671400 100644
+--- a/terminal/terminal-preferences-dialog.c
++++ b/terminal/terminal-preferences-dialog.c
+@@ -1893,7 +1893,7 @@ terminal_preferences_dialog_presets_changed (TerminalPreferencesDialog *dialog,
+   GValue        src = { 0, };
+   GValue        dst = { 0, };
+ 
+-  g_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (widget));
++  g_return_if_fail (TERMINAL_IS_PREFERENCES_DIALOG (dialog));
+   g_return_if_fail (GTK_IS_COMBO_BOX (widget));
+ 
+   combobox = GTK_COMBO_BOX (widget);
+-- 
+GitLab
+
+
diff --git a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
index fd8a38f83..a4b252e74 100755
--- a/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
+++ b/source/xfce/xfce4-terminal/xfce4-terminal.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xfce4-terminal
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -77,6 +77,10 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
+# Apply a couple upstream fixes:
+cat $CWD/177fda86451cdeaaea8ed409e6d711b670699a97.patch | patch -p1 --verbose || exit 1
+cat $CWD/71ecd2a721b059394edcfb316a20ac9d46a7b2cd.patch | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \