Mon Jan 17 22:44:42 UTC 202220220117224442

Things haven't quite settled down yet with more bugfixes and a couple of safe
upgrades, so not today folks. But enjoy Slackware's half-birthday anyway! ;-)
ap/slackpkg-15.0.10-noarch-1.txz:  Upgraded.
  Fix mirrors.ucr.ac.cr link address (Emmet Ford)
  Remove wroc.pl mirrors (Emmet Ford)
  Remove kddilabs.jp from mirrors (Emmet Ford)
  Unattended usage improvements (PiterPUNK)
  Create file to flag if the system needs restart (PiterPUNK)
  Thanks to Robby Workman.
kde/kstars-3.5.7-x86_64-1.txz:  Upgraded.
kde/kwin-5.23.5-x86_64-2.txz:  Rebuilt.
  [PATCH] Bypass wayland interface blacklisting.
  Thanks to LuckyCyborg.
kde/plasma-workspace-5.23.5-x86_64-3.txz:  Rebuilt.
  [PATCH 1/2] Revert "Drop setupX11 from startplasma-waylandsession."
  [PATCH 2/2] Revert "Drop X11 root properties for KDE full session."
  Thanks to LuckyCyborg.
l/libical-3.0.13-x86_64-1.txz:  Upgraded.
n/p11-kit-0.24.1-x86_64-1.txz:  Upgraded.
n/stunnel-5.62-x86_64-1.txz:  Upgraded.
x/xterm-370-x86_64-4.txz:  Rebuilt.
  Fixed XTerm-console (previously XTerm.linux.console).
  Renamed XTerm.upstream.default to XTerm-upstream.
  Thanks to GazL.
xap/fluxbox-1.3.7-x86_64-6.txz:  Rebuilt.
  [PATCH] replace FbRootWindow::depth with maxDepth.
  Thanks to OldHolborn.
xap/geeqie-1.7.1-x86_64-1.txz:  Upgraded.

21 files changed, 421 insertions, 123 deletions

diff --git a/source/ap/slackpkg/files/ChangeLog b/source/ap/slackpkg/files/ChangeLog
index 0dffa771c..d97918fac 100644
--- a/source/ap/slackpkg/files/ChangeLog
+++ b/source/ap/slackpkg/files/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jan 17 06:40:41 UTC 2022
+---------------
+	- Release 15.0.10
+	- Fix mirrors.ucr.ac.cr link address (Emmet Ford)
+	- Remove wroc.pl mirrors (Emmet Ford)
+	- Remove kddilabs.jp from mirrors (Emmet Ford)
+	- Unattended usage improvements (PiterPUNK)
+	- Create file to flag if the system needs restart (PiterPUNK)
+
 Mon Dec 13 00:27:34 UTC 2021
 ---------------
 	- Release 15.0.9
diff --git a/source/ap/slackpkg/files/core-functions.sh b/source/ap/slackpkg/files/core-functions.sh
index 463a1905d..56314e990 100644
--- a/source/ap/slackpkg/files/core-functions.sh
+++ b/source/ap/slackpkg/files/core-functions.sh
@@ -1318,6 +1318,28 @@ for slackpkg to work properly.
 	fi
 }	
 
+# Checks if a critical package were upgraded by Slackpkg.
+# The /var/run/needs_restarting file contains the list of upgraded
+# packages.
+#
+# The file only is created if /var/run filesystem type is tmpfs so
+# the reboot will clean it
+function needs_restarting() {
+	if [ "$(stat -f -c %T /var/run/)" = "tmpfs" ]; then
+		find $ROOT/var/log/packages/ -cnewer $TMPDIR/timestamp -type f \( \
+			-name "kernel-generic-[0-9]*" -o \
+			-name "kernel-huge-[0-9]*" -o \
+			-name "openssl-solibs-[0-9]*" -o \
+			-name "openssl-[0-9]*" -o \
+			-name "glibc-[0-9]*" -o \
+			-name "aaa_glibc-solibs-[0-9]*" -o \
+			-name "eudev-[0-9]*" -o \
+			-name "elogind-[0-9]*" -o \
+			-name "dbus-[0-9]*" \) | \
+		awk -F/ '{ print $NF }' >> $ROOT/var/run/needs_restarting
+	fi
+}
+
 function remove_pkg() {
 	local i
 
@@ -1342,6 +1364,7 @@ function upgrade_pkg() {
 	for i in $SHOWLIST; do
 		getpkg $i upgradepkg Upgrading
 	done
+	needs_restarting
 }
 
 function install_pkg() {
diff --git a/source/ap/slackpkg/files/mirrors-x86.sample b/source/ap/slackpkg/files/mirrors-x86.sample
index 0d14b201b..81f133d99 100644
--- a/source/ap/slackpkg/files/mirrors-x86.sample
+++ b/source/ap/slackpkg/files/mirrors-x86.sample
@@ -85,8 +85,8 @@
 # http://mirrors.163.com/slackware/slackware-15.0/
 # http://mirrors.ustc.edu.cn/slackware/slackware-15.0/
 # COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-15.0/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-15.0/
+# ftp://mirrors.ucr.ac.cr/slackware/slackware-15.0/
+# http://mirrors.ucr.ac.cr/slackware/slackware-15.0/
 # CZECH REPUBLIC (CZ)
 # ftp://odysseus.linux.cz/pub/linux/slackware/slackware-15.0/
 # http://odysseus.linux.cz/pub/linux/slackware/slackware-15.0/
@@ -126,8 +126,6 @@
 # JAPAN (JP)
 # ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-15.0/
 # http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-15.0/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-15.0/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-15.0/
 # ftp://riksun.riken.go.jp/Linux/slackware/slackware-15.0/
 # http://riksun.riken.go.jp/Linux/slackware/slackware-15.0/
 # LITHUANIA (LT)
@@ -142,14 +140,10 @@
 # ftp://ftp.slackware.no/slackware/slackware-15.0/
 # http://ftp.slackware.no/slackware/slackware-15.0/
 # POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-15.0/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-15.0/
 # ftp://ftp.slackware.pl/pub/slackware/slackware-15.0/
 # http://ftp.slackware.pl/pub/slackware/slackware-15.0/
 # ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware-15.0/
 # http://sunsite.icm.edu.pl/packages/linux-slackware/slackware-15.0/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-15.0/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-15.0/
 # RUSSIA (RU)
 # http://mirror.rol.ru/slackware/slackware-15.0/
 # ftp://mirror.yandex.ru/slackware/slackware-15.0/
@@ -241,8 +235,8 @@
 # http://mirrors.163.com/slackware/slackware-current/
 # http://mirrors.ustc.edu.cn/slackware/slackware-current/
 # COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-current/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware-current/
+# ftp://mirrors.ucr.ac.cr/slackware/slackware-current/
+# http://mirrors.ucr.ac.cr/slackware/slackware-current/
 # CZECH REPUBLIC (CZ)
 # ftp://odysseus.linux.cz/pub/linux/slackware/slackware-current/
 # http://odysseus.linux.cz/pub/linux/slackware/slackware-current/
@@ -287,8 +281,6 @@
 # JAPAN (JP)
 # ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-current/
 # http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware-current/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-current/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware-current/
 # ftp://riksun.riken.go.jp/Linux/slackware/slackware-current/
 # http://riksun.riken.go.jp/Linux/slackware/slackware-current/
 # LITHUANIA (LT)
@@ -303,14 +295,10 @@
 # ftp://ftp.slackware.no/slackware/slackware-current/
 # http://ftp.slackware.no/slackware/slackware-current/
 # POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-current/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware-current/
 # ftp://ftp.slackware.pl/pub/slackware/slackware-current/
 # http://ftp.slackware.pl/pub/slackware/slackware-current/
 # ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware-current/
 # http://sunsite.icm.edu.pl/packages/linux-slackware/slackware-current/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-current/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware-current/
 # RUSSIA (RU)
 # http://mirror.rol.ru/slackware/slackware-current/
 # ftp://mirror.yandex.ru/slackware/slackware-current/
diff --git a/source/ap/slackpkg/files/mirrors-x86_64.sample b/source/ap/slackpkg/files/mirrors-x86_64.sample
index 21d3c4b7a..08731e0b8 100644
--- a/source/ap/slackpkg/files/mirrors-x86_64.sample
+++ b/source/ap/slackpkg/files/mirrors-x86_64.sample
@@ -85,8 +85,8 @@
 # http://mirrors.163.com/slackware/slackware64-15.0/
 # http://mirrors.ustc.edu.cn/slackware/slackware64-15.0/
 # COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-15.0/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-15.0/
+# ftp://mirrors.ucr.ac.cr/slackware/slackware64-15.0/
+# http://mirrors.ucr.ac.cr/slackware/slackware64-15.0/
 # CZECH REPUBLIC (CZ)
 # ftp://odysseus.linux.cz/pub/linux/slackware/slackware64-15.0/
 # http://odysseus.linux.cz/pub/linux/slackware/slackware64-15.0/
@@ -124,8 +124,6 @@
 # JAPAN (JP)
 # ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-15.0/
 # http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-15.0/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-15.0/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-15.0/
 # ftp://riksun.riken.go.jp/Linux/slackware/slackware64-15.0/
 # http://riksun.riken.go.jp/Linux/slackware/slackware64-15.0/
 # LITHUANIA (LT)
@@ -140,14 +138,10 @@
 # ftp://ftp.slackware.no/slackware/slackware64-15.0/
 # http://ftp.slackware.no/slackware/slackware64-15.0/
 # POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-15.0/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-15.0/
 # ftp://ftp.slackware.pl/pub/slackware/slackware64-15.0/
 # http://ftp.slackware.pl/pub/slackware/slackware64-15.0/
 # ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware64-15.0/
 # http://sunsite.icm.edu.pl/packages/linux-slackware/slackware64-15.0/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-15.0/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-15.0/
 # RUSSIA (RU)
 # http://mirror.rol.ru/slackware/slackware64-15.0/
 # ftp://mirror.yandex.ru/slackware/slackware64-15.0/
@@ -238,8 +232,8 @@
 # http://mirrors.163.com/slackware/slackware64-current/
 # http://mirrors.ustc.edu.cn/slackware/slackware64-current/
 # COSTA RICA (CR)
-# ftp://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-current/
-# http://mirrors.ucr.ac.cr/slackware/pub/slackware/slackware64-current/
+# ftp://mirrors.ucr.ac.cr/slackware/slackware64-current/
+# http://mirrors.ucr.ac.cr/slackware/slackware64-current/
 # CZECH REPUBLIC (CZ)
 # ftp://odysseus.linux.cz/pub/linux/slackware/slackware64-current/
 # http://odysseus.linux.cz/pub/linux/slackware/slackware64-current/
@@ -282,8 +276,6 @@
 # JAPAN (JP)
 # ftp://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-current/
 # http://ftp.nara.wide.ad.jp/pub/Linux/slackware/slackware64-current/
-# ftp://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-current/
-# http://ftp.kddilabs.jp/Linux/distributions/Slackware/slackware64-current/
 # ftp://riksun.riken.go.jp/Linux/slackware/slackware64-current/
 # http://riksun.riken.go.jp/Linux/slackware/slackware64-current/
 # LITHUANIA (LT)
@@ -298,14 +290,10 @@
 # ftp://ftp.slackware.no/slackware/slackware64-current/
 # http://ftp.slackware.no/slackware/slackware64-current/
 # POLAND (PL)
-# ftp://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-current/
-# http://ftp.pwr.wroc.pl/pub/linux/slackware/slackware64-current/
 # ftp://ftp.slackware.pl/pub/slackware/slackware64-current/
 # http://ftp.slackware.pl/pub/slackware/slackware64-current/
 # ftp://sunsite.icm.edu.pl/vol/rzm1/linux-slackware/slackware64-current/
 # http://sunsite.icm.edu.pl/packages/linux-slackware/slackware64-current/
-# ftp://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-current/
-# http://z-ftp.wcss.wroc.pl/pub/linux/slackware/slackware64-current/
 # RUSSIA (RU)
 # http://mirror.rol.ru/slackware/slackware64-current/
 # ftp://mirror.yandex.ru/slackware/slackware64-current/
diff --git a/source/ap/slackpkg/files/post-functions.conf-sample b/source/ap/slackpkg/files/post-functions.conf-sample
index 1cbe04ad0..79b5b1b1d 100644
--- a/source/ap/slackpkg/files/post-functions.conf-sample
+++ b/source/ap/slackpkg/files/post-functions.conf-sample
@@ -1,4 +1,4 @@
-# You can list here the .new files and the default action 
+# You can list here the .new files and the default action
 # to do for each file. The list format is:
 # 
 # /full/path/of/dot/new/file.new:action
@@ -9,6 +9,11 @@
 # R to Remove the new file
 # K to Keep the current and the .new files
 #
+# Using "default" as file name, you'll set the action for
+# the .new files in batch mode. The action for each file
+# takes precedence over the "default" one.
+#
 # E.g:
 #/etc/slackpkg/mirrors.new:K
 #/etc/ntp.conf.new:R
+#default:O
diff --git a/source/ap/slackpkg/files/post-functions.sh b/source/ap/slackpkg/files/post-functions.sh
index e0036430f..0339e0052 100644
--- a/source/ap/slackpkg/files/post-functions.sh
+++ b/source/ap/slackpkg/files/post-functions.sh
@@ -152,6 +152,7 @@ looknew() {
 		-name "*.new" \
 		${ONLY_NEW_DOTNEW} \
 		-not -name "rc.inet1.conf.new" \
+		-not -name "rc.wireless.conf.new" \
 		-not -name "group.new" \
 		-not -name "passwd.new" \
 		-not -name "shadow.new" \
@@ -248,6 +249,9 @@ EOF
 		answer
 		if [ "${BATCH}" = "on" ] && [ -n "${NEWCONFIG}" ]; then
 			ANSWER=P
+
+			# This allows to have a default behaviour for all .new files in batch mode.
+			DEF_AUTOANSWER="$(sed -ne 's#^default:\([ORK]\)#\1#p' $NEWCONFIG 2>/dev/null)"
 		fi
 		case $ANSWER in
 			K|k)
@@ -277,7 +281,7 @@ EOF
 							echo $ANSWER
 						else
 							if [ "${BATCH}" = "on" ]; then
-								ANSWER=K
+								ANSWER=${DEF_AUTOANSWER:-K}
 								echo $ANSWER
 							else
 								read ANSWER
@@ -340,7 +344,10 @@ Your kernel image was updated, and lilo does not appear to be used on
 your system.  You may need to adjust your boot manager (like GRUB) to 
 boot the appropriate kernel (after generating an initrd if required)."
 		fi
-		echo -e "Press the \"Enter\" key to continue...\n "
-		read _junk
+
+		if [ "${BATCH}" != "on" ]; then
+			echo -e "Press the \"Enter\" key to continue...\n "
+			read _junk
+		fi
 	fi
 }
diff --git a/source/ap/slackpkg/slackpkg.SlackBuild b/source/ap/slackpkg/slackpkg.SlackBuild
index ccb24650c..4f630c485 100755
--- a/source/ap/slackpkg/slackpkg.SlackBuild
+++ b/source/ap/slackpkg/slackpkg.SlackBuild
@@ -23,7 +23,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=slackpkg
-VERSION=${VERSION:-15.0.9}
+VERSION=${VERSION:-15.0.10}
 ARCH="noarch"
 BUILD=${BUILD:-1}
 
diff --git a/source/kde/kde/build/kwin b/source/kde/kde/build/kwin
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kwin
+++ b/source/kde/kde/build/kwin
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch
new file mode 100644
index 000000000..829028e5b
--- /dev/null
+++ b/source/kde/kde/patch/kwin.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch b/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch
new file mode 100644
index 000000000..7968887a6
--- /dev/null
+++ b/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch
@@ -0,0 +1,26 @@
+From 76abce728d3abb94c71076e6211a0da655397b0f Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 12 Nov 2019 13:18:26 +0100
+Subject: [PATCH] Bypass wayland interface blacklisting
+
+Currently the check isn't worth anything and it breaks some applications.
+See discussion on https://phabricator.kde.org/D22571 and https://phabricator.kde.org/T4437#207062.
+---
+ src/wayland_server.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
+index e93d51911..95f3a746a 100644
+--- a/src/wayland_server.cpp
++++ b/src/wayland_server.cpp
+@@ -130,6 +130,7 @@ public:
+     QSet<QString> m_reported;
+ 
+     bool allowInterface(KWaylandServer::ClientConnection *client, const QByteArray &interfaceName) override {
++        return true;
+         if (client->processId() == getpid()) {
+             return true;
+         }
+-- 
+2.25.1
+
diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch
index d6d7d971b..7d2b9d398 100644
--- a/source/kde/kde/patch/plasma-workspace.patch
+++ b/source/kde/kde/patch/plasma-workspace.patch
@@ -1,4 +1,5 @@
-# [PATCH] Revert "No icons on the desktop by default":
 cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 cat $CWD/patch/plasma-workspace/70d23b89.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 cat $CWD/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch b/source/kde/kde/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch
new file mode 100644
index 000000000..4ed7dc6fa
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch
@@ -0,0 +1,30 @@
+From 5db85cf17cd11236f8ee44ba95dd56b81087c6aa Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Thu, 21 Oct 2021 08:20:33 +0200
+Subject: [PATCH 1/2] Revert "Drop setupX11 from startplasma-waylandsession"
+
+This reverts commit 8bf0e43620de3416e783c307ba10111c6964757b.
+---
+ startkde/startplasma-waylandsession.cpp | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
+index 3a054a04f..ed496cc24 100644
+--- a/startkde/startplasma-waylandsession.cpp
++++ b/startkde/startplasma-waylandsession.cpp
+@@ -19,6 +19,12 @@ int main(int argc, char **argv)
+ 
+     out << "startplasma-waylandsession: Starting up...";
+ 
++    if (qEnvironmentVariableIsSet("DISPLAY")) {
++        setupX11();
++    } else {
++        qWarning() << "running kwin without Xwayland support";
++    }
++
+     if (!syncDBusEnvironment()) {
+         out << "Could not sync environment to dbus.\n";
+         return 2;
+-- 
+2.33.0
+
diff --git a/source/kde/kde/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch b/source/kde/kde/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch
new file mode 100644
index 000000000..3f6d71970
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch
@@ -0,0 +1,86 @@
+From 075b2f27722d2f28a5c3d4e201c7e7e787cb68de Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Thu, 21 Oct 2021 08:20:38 +0200
+Subject: [PATCH 2/2] Revert "Drop X11 root properties for KDE full session /
+ session version"
+
+This reverts commit 9a4e3d39c2a9ca48f39a60ae2ea88e9921723cec.
+---
+ startkde/startplasma-waylandsession.cpp |  1 +
+ startkde/startplasma-x11.cpp            |  1 +
+ startkde/startplasma.cpp                | 22 ++++++++++++++++++++++
+ startkde/startplasma.h                  |  1 +
+ 4 files changed, 25 insertions(+)
+
+diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
+index ed496cc24..d0c83bf5a 100644
+--- a/startkde/startplasma-waylandsession.cpp
++++ b/startkde/startplasma-waylandsession.cpp
+@@ -41,6 +41,7 @@ int main(int argc, char **argv)
+     // Keep for KF5; remove in KF6 (KInit will be gone then)
+     runSync(QStringLiteral("kdeinit5_shutdown"), {});
+ 
++    cleanupX11();
+     out << "startplasma-waylandsession: Done.\n";
+ 
+     return 0;
+diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
+index d6b2c5439..7ddf7b3ea 100644
+--- a/startkde/startplasma-x11.cpp
++++ b/startkde/startplasma-x11.cpp
+@@ -93,6 +93,7 @@ int main(int argc, char **argv)
+     runSync(QStringLiteral("kdeinit5_shutdown"), {});
+ 
+     cleanupPlasmaEnvironment(oldSystemdEnvironment);
++    cleanupX11();
+ 
+     out << "startkde: Done.\n";
+ 
+diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
+index 8d0b0ba89..5f78e7016 100644
+--- a/startkde/startplasma.cpp
++++ b/startkde/startplasma.cpp
+@@ -336,6 +336,28 @@ void setupX11()
+     //     so don't move this up.
+ 
+     runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
++    runSync(QStringLiteral("xprop"),
++            {QStringLiteral("-root"),
++             QStringLiteral("-f"),
++             QStringLiteral("KDE_FULL_SESSION"),
++             QStringLiteral("8t"),
++             QStringLiteral("-set"),
++             QStringLiteral("KDE_FULL_SESSION"),
++             QStringLiteral("true")});
++    runSync(QStringLiteral("xprop"),
++            {QStringLiteral("-root"),
++             QStringLiteral("-f"),
++             QStringLiteral("KDE_SESSION_VERSION"),
++             QStringLiteral("32c"),
++             QStringLiteral("-set"),
++             QStringLiteral("KDE_SESSION_VERSION"),
++             QStringLiteral("5")});
++}
++
++void cleanupX11()
++{
++    runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
++    runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
+ }
+ 
+ void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment)
+diff --git a/startkde/startplasma.h b/startkde/startplasma.h
+index e8684be74..00c5c1570 100644
+--- a/startkde/startplasma.h
++++ b/startkde/startplasma.h
+@@ -26,6 +26,7 @@ void importSystemdEnvrionment();
+ void runEnvironmentScripts();
+ void setupPlasmaEnvironment();
+ void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment);
++void cleanupX11();
+ bool syncDBusEnvironment();
+ void setupFontDpi();
+ QProcess *setupKSplash();
+-- 
+2.33.0
+
diff --git a/source/x/xterm/XTerm-console b/source/x/xterm/XTerm-console
new file mode 100644
index 000000000..7dbe6d55b
--- /dev/null
+++ b/source/x/xterm/XTerm-console
@@ -0,0 +1,102 @@
+! /etc/X11/app-defaults/XTerm-console !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+!
+!  This resorce file will, as much as possible, configure
+!  xterm to look and act like a linux console:
+
+#include "XTerm-upstream"
+
+! VT100 Fonts !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+*VT100.renderFont: false
+!   - Use bitmap fonts by default. User can switch to Scalable/TrueType 
+!     fonts from the VT_FONTS ctrl/right-click menu if required. 
+
+*VT100.initialFont: 3
+!   - Choose which of the following gets used on start, values: 1-6, or 'd'.
+!     It probably makes sense to set this to the same as the default font.
+
+! Bitmap fonts:
+!   note: Some folks may find these a little large, but 'hidpi' display
+!   users will appreciate the larger sizes, and the other sizes in the
+!   the terminus series don't maintain a consistent aspect ration and 
+!   can look a little odd when being resized.
+
+*VT100.font: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1
+*VT100.font1: -*-terminus-bold-r-normal-*-12-*-*-*-*-*-iso10646-1
+*VT100.font2: -*-terminus-bold-r-normal-*-16-*-*-*-*-*-iso10646-1
+*VT100.font3: -*-terminus-bold-r-normal-*-20-*-*-*-*-*-iso10646-1
+*VT100.font4: -*-terminus-bold-r-normal-*-24-*-*-*-*-*-iso10646-1
+*VT100.font5: -*-terminus-bold-r-normal-*-28-*-*-*-*-*-iso10646-1
+*VT100.font6: -*-terminus-bold-r-normal-*-32-*-*-*-*-*-iso10646-1
+
+! Scalable/TrueType fonts:
+
+*VT100.faceName: monospace
+*VT100.faceSize: 12.0
+*VT100.faceSize1: 6.0
+*VT100.faceSize2: 10.0
+*VT100.faceSize3: 12.0
+*VT100.faceSize4: 16.0
+*VT100.faceSize5: 18.0
+*VT100.faceSize6: 22.0
+
+! VT100 colours and appearance !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+*VT100.Background: rgb:00/00/00
+*VT100.Foreground: rgb:aa/aa/aa
+*VT100.cursorUnderLine: true
+*VT100.cursorBlink: true
+
+! Simulate underline using colour, just like the console does:
+*VT100.colorULMode: true
+*VT100.colorUL: rgb:00/aa/aa
+
+! Simulate bold using colour, just like the console does:
+*VT100.boldMode: false
+*VT100.colorBDMode: true
+*VT100.colorBD: rgb:ff/ff/ff
+
+! CGA 16-colour palette:
+*VT100.color0: rgb:00/00/00
+*VT100.color1: rgb:aa/00/00
+*VT100.color2: rgb:00/aa/00
+*VT100.color3: rgb:aa/55/00
+*VT100.color4: rgb:00/00/aa
+*VT100.color5: rgb:aa/00/aa
+*VT100.color6: rgb:00/aa/aa
+*VT100.color7: rgb:aa/aa/aa
+*VT100.color8: rgb:55/55/55
+*VT100.color9: rgb:ff/55/55
+*VT100.color10: rgb:55/ff/55
+*VT100.color11: rgb:ff/ff/55
+*VT100.color12: rgb:55/55/ff
+*VT100.color13: rgb:ff/55/ff
+*VT100.color14: rgb:55/ff/ff
+*VT100.color15: rgb:ff/ff/ff
+
+*termName: xterm-16color
+!   - 16 colours only, just like the console.
+
+! Some behavioural stuff to make it work nice !!!!!!!!!!!!!!!!!!!!!!!!!!
+
+*VT100.metaSendsEscape: true
+!   - Send meta-characters as a two-byte sequence prefixed with ESCAPE.
+!     "XTerm.vt100.eightBitInput: false" is an alternative approach
+!     but metaSendsEscape has a menu option in the ctrl-button1
+!     popup menu, allowing the user to turn it off if need be. The
+!     Linux console and most other terminal emulators do this by default.
+
+*VT100.bellIsUrgent: true
+!   - Enable urgency hit for Window managers.
+
+*VT100.charClass: 45-47:48,58:48,64:48
+!   - Set which characters are selected by double click.
+
+!*VT100.locale: true
+!   - Seems better to use the XTerm.locale below, as this throws an
+!     error if LC_ALL is unset.
+
+*XTerm.locale: true
+!   - Enable conversion between the locale and utf-8.
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! End. !
diff --git a/source/x/xterm/linux-console-xterm.ad b/source/x/xterm/linux-console-xterm.ad
deleted file mode 100644
index 12c4fdfed..000000000
--- a/source/x/xterm/linux-console-xterm.ad
+++ /dev/null
@@ -1,71 +0,0 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!  These resources will, as much as possible, configure xterm to look
-!  like a linux console.
-!  To use this file, copy it to: /etc/X11/app-defaults/XTerm
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-! Choose one below:
-!XTerm.termName: xterm-new
-!!   Use the more featureful 'xterm-new' terminfo entry.
-XTerm.termName: xterm
-!   Use the standard 'xterm' terminfo entry.
-
-XTerm.locale: true
-!   Enable conversion between the locale and utf-8 if necessary.
-!XTerm.ptyInitialErase: false
-!   Set the tty erase setting to match the terminfo/cap definition for
-!   this terminal type.
-!XTerm.backarrowKeyIsErase: true
-!   Send the erase character when the backarrow key (a.k.a. backspace)
-!   is pressed.
-XTerm.vt100.metaSendsEscape: true
-!   Send meta-characters as a two-byte sequence prefixed with ESCAPE.
-!   "XTerm.vt100.eightBitInput: false" is an alternative approach
-!   but metaSendsEscape has a menu option in the ctrl-button1
-!   popup menu, allowing the user to turn it off if need be. The
-!   Linux console and most other terminal emulators do this by default.
-XTerm.vt100.bellIsUrgent: true
-!   Enable urgency hit for Window managers.
-XTerm.vt100.renderFont: false
-!   Use bitmap fonts by default.User can switch to ttyfonts from menu,
-!   if required. 
-XTerm.vt100.font: -*-terminus-medium-r-normal-*-20-*-*-*-*-*-iso10646-1
-XTerm.vt100.font1: -*-terminus-medium-r-normal-*-12-*-*-*-*-*-iso10646-1
-XTerm.vt100.font2: -*-terminus-medium-r-normal-*-14-*-*-*-*-*-iso10646-1
-XTerm.vt100.font3: -*-terminus-medium-r-normal-*-16-*-*-*-*-*-iso10646-1
-XTerm.vt100.font4: -*-terminus-medium-r-normal-*-20-*-*-*-*-*-iso10646-1
-XTerm.vt100.font5: -*-terminus-medium-r-normal-*-24-*-*-*-*-*-iso10646-1
-XTerm.vt100.font6: -*-terminus-medium-r-normal-*-32-*-*-*-*-*-iso10646-1
-
-XTerm.vt100.faceName: monospace
-XTerm.vt100.faceSize: 14.0
-XTerm*Background: rgb:00/00/00
-XTerm*Foreground: rgb:aa/aa/aa
-XTerm*cursorUnderLine: true
-XTerm*cursorBlink: true
-XTerm*boldMode: false
-XTerm*colorULMode: true
-XTerm*colorUL: rgb:00/aa/aa
-XTerm*colorBDMode: true
-XTerm*colorBD: rgb:ff/ff/ff
-! CGA 16-colour palatte:
-XTerm*color0: rgb:00/00/00
-XTerm*color1: rgb:aa/00/00
-XTerm*color2: rgb:00/aa/00
-XTerm*color3: rgb:aa/55/00
-XTerm*color4: rgb:00/00/aa
-XTerm*color5: rgb:aa/00/aa
-XTerm*color6: rgb:00/aa/aa
-XTerm*color7: rgb:aa/aa/aa
-XTerm*color8: rgb:55/55/55
-XTerm*color9: rgb:ff/55/55
-XTerm*color10: rgb:55/ff/55
-XTerm*color11: rgb:ff/ff/55
-XTerm*color12: rgb:55/55/ff
-XTerm*color13: rgb:ff/55/ff
-XTerm*color14: rgb:55/ff/ff
-XTerm*color15: rgb:ff/ff/ff
-
-XTerm*charClass: 45-47:48,58:48,64:48
-
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index ff1aff97e..0b1aa21fd 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xterm
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -113,10 +113,10 @@ cp xterm.desktop uxterm.desktop $PKG/usr/share/applications
 
 # Install a sample XTerm app-defaults that looks like the Linux console.
 # Thanks to GazL.
-cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
-cp -a $CWD/linux-console-xterm.ad $PKG/etc/X11/app-defaults/XTerm.linux.console
-chown root:root $PKG/etc/X11/app-defaults/XTerm.linux.console
-chmod 644 $PKG/etc/X11/app-defaults/XTerm.linux.console
+cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm-upstream
+cp -a $CWD/XTerm-console $PKG/etc/X11/app-defaults/XTerm-console
+chown root:root $PKG/etc/X11/app-defaults/XTerm-console
+chmod 644 $PKG/etc/X11/app-defaults/XTerm-console
 
 # Install app-defaults as .new:
 mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new
diff --git a/source/xap/fluxbox/dcdde4d32c93d01df205bc06d7dfcbd356be031f.patch b/source/xap/fluxbox/dcdde4d32c93d01df205bc06d7dfcbd356be031f.patch
new file mode 100644
index 000000000..71b558e1c
--- /dev/null
+++ b/source/xap/fluxbox/dcdde4d32c93d01df205bc06d7dfcbd356be031f.patch
@@ -0,0 +1,100 @@
+From dcdde4d32c93d01df205bc06d7dfcbd356be031f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Thomas=20L=C3=BCbking?= <thomas.luebking@gmail.com>
+Date: Sat, 25 Jun 2016 22:25:48 +0200
+Subject: replace FbRootWindow::depth with maxDepth
+
+The depth member of FbWindow was abused to store the maximum depth
+but that gets overridden with geometry changes of the root window
+(screen layout changes) so we store and read the value explicitly while
+::depth() maintains the actual depth of the root window
+
+The result of this is that frames for ARGB windows were created with a
+wrong depth and failed to reparent the client window.
+
+BUG: 1102
+BUG: 1058
+---
+ src/FbRootWindow.cc | 7 ++++---
+ src/FbRootWindow.hh | 2 ++
+ src/FbWinFrame.cc   | 4 ++--
+ src/Screen.cc       | 2 +-
+ 4 files changed, 9 insertions(+), 6 deletions(-)
+
+diff --git a/src/FbRootWindow.cc b/src/FbRootWindow.cc
+index d17d56f..91bd695 100644
+--- a/src/FbRootWindow.cc
++++ b/src/FbRootWindow.cc
+@@ -30,7 +30,8 @@ FbRootWindow::FbRootWindow(int screen_num):
+     m_colormap(0),
+     m_decorationDepth(0),
+     m_decorationVisual(0),
+-    m_decorationColormap(0) {
++    m_decorationColormap(0),
++    m_maxDepth(depth()) {
+ 
+     Display *disp = FbTk::App::instance()->display();
+ 
+@@ -55,9 +56,9 @@ FbRootWindow::FbRootWindow(int screen_num):
+ 
+         for (int i = 0; i < vinfo_nitems; i++) {
+             if ((DefaultDepth(disp, screen_num) < vinfo_return[i].depth)
+-                    && (static_cast<int>(depth()) < vinfo_return[i].depth)){
++                    && (m_maxDepth < vinfo_return[i].depth)){
+                 m_visual = vinfo_return[i].visual;
+-                setDepth(vinfo_return[i].depth);
++                m_maxDepth = vinfo_return[i].depth;
+             }
+ 
+             if((m_decorationDepth < vinfo_return[i].depth)
+diff --git a/src/FbRootWindow.hh b/src/FbRootWindow.hh
+index 8e97cc3..739c9ef 100644
+--- a/src/FbRootWindow.hh
++++ b/src/FbRootWindow.hh
+@@ -41,6 +41,7 @@ public:
+     int decorationDepth() const { return m_decorationDepth; }
+     Visual *decorationVisual() const { return m_decorationVisual; }
+     Colormap decorationColormap() const { return m_decorationColormap; }
++    int maxDepth() const { return m_maxDepth; }
+ 
+ private:
+     Visual *m_visual;
+@@ -49,6 +50,7 @@ private:
+     int m_decorationDepth;
+     Visual *m_decorationVisual;
+     Colormap m_decorationColormap;
++    int m_maxDepth;
+ };
+ 
+ #endif // FBROOTWINDOW_HH
+diff --git a/src/FbWinFrame.cc b/src/FbWinFrame.cc
+index 48d6e87..42b81e7 100644
+--- a/src/FbWinFrame.cc
++++ b/src/FbWinFrame.cc
+@@ -115,8 +115,8 @@ FbWinFrame::FbWinFrame(BScreen &screen, unsigned int client_depth,
+     m_state(state),
+     m_window(theme->screenNum(), state.x, state.y, state.width, state.height, s_mask, true, false,
+         client_depth, InputOutput,
+-        ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().visual() : CopyFromParent),
+-        ((client_depth == 32) && (screen.rootWindow().depth() == 32) ? screen.rootWindow().colormap() : CopyFromParent)),
++        (client_depth == screen.rootWindow().maxDepth() ? screen.rootWindow().visual() : CopyFromParent),
++        (client_depth == screen.rootWindow().maxDepth() ? screen.rootWindow().colormap() : CopyFromParent)),
+     m_layeritem(window(), *screen.layerManager().getLayer(ResourceLayer::NORMAL)),
+     m_titlebar(m_window, 0, 0, 100, 16, s_mask, false, false, 
+         screen.rootWindow().decorationDepth(), InputOutput,
+diff --git a/src/Screen.cc b/src/Screen.cc
+index 2b5411d..94e4250 100644
+--- a/src/Screen.cc
++++ b/src/Screen.cc
+@@ -297,7 +297,7 @@ BScreen::BScreen(FbTk::ResourceManager &rm,
+                             "using visual 0x%lx, depth %d\n",
+                             "informational message saying screen number (%d), visual (%lx), and colour depth (%d)").c_str(),
+             screenNumber(), XVisualIDFromVisual(rootWindow().visual()),
+-            rootWindow().depth());
++            rootWindow().maxDepth());
+ #endif // DEBUG
+ 
+     FbTk::EventManager *evm = FbTk::EventManager::instance();
+-- 
+cgit v0.11.2
+
+
diff --git a/source/xap/fluxbox/fluxbox.SlackBuild b/source/xap/fluxbox/fluxbox.SlackBuild
index 934b6b0a3..33baf85eb 100755
--- a/source/xap/fluxbox/fluxbox.SlackBuild
+++ b/source/xap/fluxbox/fluxbox.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-# Copyright 2008, 2009, 2010, 2011, 2012, 2018  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011, 2012, 2018, 2022  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=fluxbox
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -86,6 +86,9 @@ zcat $CWD/fluxbox.keys.diff.gz | patch -p1 --verbose || exit 1
 # Fix build with gcc11:
 zcat $CWD/fluxbox.gcc11.patch.gz | patch -p1 --verbose || exit 1
 
+# Fix broken window decorations with Firefox:
+zcat $CWD/dcdde4d32c93d01df205bc06d7dfcbd356be031f.patch.gz | patch -p1 --verbose || exit 1
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
diff --git a/source/xap/geeqie/geeqie.SlackBuild b/source/xap/geeqie/geeqie.SlackBuild
index 5f3e6d9e0..8d45fe6c2 100755
--- a/source/xap/geeqie/geeqie.SlackBuild
+++ b/source/xap/geeqie/geeqie.SlackBuild
@@ -25,7 +25,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=geeqie
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
 
 # Download the geeqie Git head if there's no tarball:
 if ! /bin/ls $CWD/geeqie*tar* 1> /dev/null 2> /dev/null ; then
@@ -36,7 +36,7 @@ if ! /bin/ls $CWD/geeqie*tar* 1> /dev/null 2> /dev/null ; then
   rm -r $CWD/geeqie-$(date +%Y%m%d)git
 fi
 
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -77,7 +77,7 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
 cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
@@ -110,7 +110,7 @@ make install-strip DESTDIR=$PKG || exit 1
 
 mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
 cp -a \
-  AUTHORS COPYING* INSTALL NEWS README* TODO \
+  AUTHORS* CHECKLIST* CODING* COPYING* NEWS* README* TODO* \
   $PKG/usr/doc/$PKGNAM-$VERSION
 
 # If there's a ChangeLog, installing at least part of the recent history
@@ -142,4 +142,3 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh
 
 cd $PKG
 /sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
-
diff --git a/source/xap/geeqie/geeqie.url b/source/xap/geeqie/geeqie.url
new file mode 100644
index 000000000..a054ef71b
--- /dev/null
+++ b/source/xap/geeqie/geeqie.url
@@ -0,0 +1 @@
+https://github.com/BestImageViewer/geeqie