10 files changed, 113 insertions, 19 deletions
diff --git a/source/a/grub/grub.SlackBuild b/source/a/grub/grub.SlackBuild
index 5740a983c..1ddd07a33 100755
--- a/source/a/grub/grub.SlackBuild
+++ b/source/a/grub/grub.SlackBuild
@@ -28,7 +28,7 @@ PKGNAM=grub
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 # Better to use _ than ~ in the package filenames version:
 PKGVER=$(echo $VERSION | tr '~' '_')
-BUILD=${BUILD:-10}
+BUILD=${BUILD:-11}
 
 # If you use stack-protector, then grub will not work with legacy BIOS:
 STACKPROTECT=${STACKPROTECT:---enable-stack-protector=no}
@@ -149,6 +149,7 @@ build_grub() {
     --infodir=/usr/info \
     --mandir=/usr/man \
     --disable-werror \
+    --with-dejavufont=/usr/share/fonts/TTF/DejaVuSans.ttf \
     $STACKPROTECT \
     $EFI_DO || exit 1
 
diff --git a/source/d/rinutils/rinutils.url b/source/d/rinutils/rinutils.url
index bd067ac9e..e6adaf703 100644
--- a/source/d/rinutils/rinutils.url
+++ b/source/d/rinutils/rinutils.url
@@ -1 +1,2 @@
 https://github.com/shlomif/rinutils
+https://github.com/shlomif/rinutils/releases/download/0.10.3/rinutils-0.10.3.tar.xz
diff --git a/source/l/qt6/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch b/source/l/qt6/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch
new file mode 100644
index 000000000..ac63876c7
--- /dev/null
+++ b/source/l/qt6/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch
@@ -0,0 +1,37 @@
+From 92bcb8f6b7a852c7a5d662fc34de561692a7a454 Mon Sep 17 00:00:00 2001
+From: Vlad Zahorodnii <vlad.zahorodnii@kde.org>
+Date: Thu, 20 Jun 2024 11:25:06 +0300
+Subject: [PATCH] Client: Ensure that guessed popup parent has a shell surface
+
+The last input window may not have a shell surface if it is a subsurface
+or that window has been just made invisible.
+
+Change-Id: Iad11c68659579429ddc5d9ba0038975b25da8e0d
+Reviewed-by: David Edmundson <davidedmundson@kde.org>
+(cherry picked from commit 52c406cec149634680489faeeaf06bb1258cd12f)
+Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
+(cherry picked from commit 7d04c18531276c94bfdf2f9a955d6f02554b28b2)
+---
+ src/client/qwaylandwindow.cpp | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/src/client/qwaylandwindow.cpp b/src/client/qwaylandwindow.cpp
+index 22aeba102..c3725ffc9 100644
+--- a/src/client/qwaylandwindow.cpp
++++ b/src/client/qwaylandwindow.cpp
+@@ -1157,8 +1157,10 @@ QWaylandWindow *QWaylandWindow::guessTransientParent() const
+             return mTopPopup;
+     }
+ 
+-    if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup)
+-        return display()->lastInputWindow();
++    if (window()->type() == Qt::ToolTip || window()->type() == Qt::Popup) {
++        if (auto lastInputWindow = display()->lastInputWindow())
++            return closestShellSurfaceWindow(lastInputWindow->window());
++    }
+ 
+     return nullptr;
+ }
+-- 
+GitLab
+
diff --git a/source/l/qt6/patches/qtwebengine-6.7.0-ninja1.12.patch b/source/l/qt6/patches/qtwebengine-6.7.0-ninja1.12.patch
new file mode 100644
index 000000000..2d12daccd
--- /dev/null
+++ b/source/l/qt6/patches/qtwebengine-6.7.0-ninja1.12.patch
@@ -0,0 +1,30 @@
+Patch status: pending being looked at upstream
+
+Issue[1][2][3] also exist in chromium itself[4], and unclear
+why this started happening only with ninja-1.12.0 at the moment.
+
+Just a quickfix, likely not fully correct and seems there may
+be further unresolved race issues.
+
+[1] https://bugs.gentoo.org/930107
+[2] https://bugreports.qt.io/browse/QTBUG-124375
+[3] https://github.com/ninja-build/ninja/issues/2417
+[4] https://bugs.gentoo.org/930112
+--- a/src/3rdparty/chromium/content/browser/BUILD.gn
++++ b/src/3rdparty/chromium/content/browser/BUILD.gn
+@@ -198,2 +198,3 @@
+     "//components/services/storage/public/mojom",
++    "//components/spellcheck:buildflags",
+     "//components/sqlite_proto",
+--- a/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
++++ b/src/3rdparty/chromium/extensions/browser/api/declarative_net_request/BUILD.gn
+@@ -22,2 +22,3 @@
+     "//content/public/browser",
++    "//components/web_cache/public/mojom",
+     "//extensions/common",
+--- a/src/core/configure/BUILD.root.gn.in
++++ b/src/core/configure/BUILD.root.gn.in
+@@ -235,2 +235,3 @@
+   deps = [
++    "//chrome/app:generated_resources",
+     "//components/zoom",
diff --git a/source/l/qt6/qt6.SlackBuild b/source/l/qt6/qt6.SlackBuild
index 646eeada3..3df343d7f 100755
--- a/source/l/qt6/qt6.SlackBuild
+++ b/source/l/qt6/qt6.SlackBuild
@@ -32,7 +32,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=qt6
 VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 PKGSRC=$(echo $VERSION | cut -d - -f 1)
 PKGVER=$(echo $VERSION | tr - _)
 
@@ -168,6 +168,16 @@ pushd qtwebengine
   cat $CWD/patches/qtwebengine-6.7.0-displaykey-header.patch | patch -p1 --verbose || exit 1
 popd
 
+# Fix for building with recent ninja:
+pushd qtwebengine
+  cat $CWD/patches/qtwebengine-6.7.0-ninja1.12.patch | patch -p1 --verbose || exit 1
+popd
+
+# Upstream crash fix (coming officially in 6.7.3):
+pushd qtwayland
+  cat $CWD/patches/92bcb8f6b7a852c7a5d662fc34de561692a7a454.patch | patch -p1 --verbose || exit 1
+popd
+
 # Previously we didn't have a protobuf package in Slackware.
 # Now that we do, it's apparently too new to use with Qt6, so let's just
 # disable it to get the same features that we previously did.
diff --git a/source/x/x11/build/xdm b/source/x/x11/build/xdm
index d00491fd7..0cfbf0888 100644
--- a/source/x/x11/build/xdm
+++ b/source/x/x11/build/xdm
@@ -1 +1 @@
-1
+2
diff --git a/source/x/x11/patch/xdm.patch b/source/x/x11/patch/xdm.patch
new file mode 100644
index 000000000..2732c0a3d
--- /dev/null
+++ b/source/x/x11/patch/xdm.patch
@@ -0,0 +1 @@
+cat $CWD/patch/xdm/xdm-greeter.patch | patch -p1 || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xdm/xdm-greeter.patch b/source/x/x11/patch/xdm/xdm-greeter.patch
new file mode 100644
index 000000000..84db96a07
--- /dev/null
+++ b/source/x/x11/patch/xdm/xdm-greeter.patch
@@ -0,0 +1,27 @@
+#  The existing calculation of Y_INC make no allowance for the size of the
+#  inner frame of the input field.  When the input field text height + the
+#  inner frame size exceed the height of the prompt text this results in
+#  misalignment and artefacts being left behind when erasing characters 
+#  with tails (such as 'j').
+#
+#  The following resource settings can be used to reproduce the issue:
+#    xlogin*face:            Helvetica-30
+#    xlogin*promptFace:      Helvetica-16:bold
+#    xlogin*innerFramesWidth: 8
+
+#  This patch resolves both issues.
+#
+#  Author: gary.langshaw@gmail.com
+
+diff -Nurp xdm-1.1.16.orig/greeter/Login.c xdm-1.1.16/greeter/Login.c
+--- xdm-1.1.16.orig/greeter/Login.c	2024-04-05 01:04:33.000000000 +0100
++++ xdm-1.1.16/greeter/Login.c	2024-06-11 15:39:20.596773706 +0100
+@@ -253,7 +253,7 @@ static XtResource resources[] = {
+ #define FAIL_X_INC(w)		F_MAX_WIDTH(fail)
+ #define FAIL_Y_INC(w)		(F_ASCENT(fail) + F_DESCENT(fail))
+ 
+-#define Y_INC(w)	max (TEXT_Y_INC(w), PROMPT_Y_INC(w))
++#define Y_INC(w)	max ((2 * (w)->login.inframeswidth) + TEXT_Y_INC(w), PROMPT_Y_INC(w))
+ 
+ 
+ #define PROMPT_TEXT(w,n) 	((w)->login.prompts[n].promptText)
diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
index 749114169..b125aa39c 100755
--- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
+++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
@@ -80,9 +80,6 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \+
 
-# This is needed to fix a missing define (at least on 32-bit):
-cat $CWD/xwayland.CARD32.define.diff | patch -p1 --verbose || exit 1
-
 # Configure, build, and install:
 export CFLAGS="$SLKCFLAGS"
 export CXXFLAGS="$SLKCFLAGS"
@@ -155,9 +152,9 @@ fi
 
 # Relocate some docs:
 mv $PKG/usr/share/doc/xorg-server/* $PKG/usr/doc/$PKGNAM-$VERSION
-rmdir $PKG/usr/share/doc/xorg-server
-rmdir $PKG/usr/share/doc
-rmdir $PKG/usr/share
+rmdir $PKG/usr/share/doc/xorg-server 2> /dev/null
+rmdir $PKG/usr/share/doc 2> /dev/null
+rmdir $PKG/usr/share 2> /dev/null
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff b/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff
deleted file mode 100644
index 10b3df156..000000000
--- a/source/x/xorg-server-xwayland/xwayland.CARD32.define.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./os/osdep.h.orig	2024-05-15 01:21:39.000000000 -0500
-+++ ./os/osdep.h	2024-05-22 13:08:46.015040109 -0500
-@@ -52,6 +52,7 @@
- #define _OSDEP_H_ 1
- 
- #include <X11/Xdefs.h>
-+#include <X11/Xtrans/Xtrans.h>
- 
- #if defined(XDMCP) || defined(HASXDMAUTH)
- #include <X11/Xdmcp.h>