Sun Jun 14 19:29:20 UTC 202020200614192920

a/haveged-1.9.11-x86_64-1.txz:  Upgraded.
l/libvncserver-0.9.13-x86_64-1.txz:  Upgraded.
n/libnetfilter_queue-1.0.5-x86_64-1.txz:  Upgraded.
x/vulkan-sdk-1.2.141.0-x86_64-1.txz:  Upgraded.
xap/xlockmore-5.64-x86_64-1.txz:  Upgraded.

8 files changed, 8 insertions, 91 deletions

diff --git a/source/l/libvncserver/libvncserver.15c4f144a3783d9f1f2c976acf9f4d85988fd466.patch b/source/l/libvncserver/libvncserver.15c4f144a3783d9f1f2c976acf9f4d85988fd466.patch
deleted file mode 100644
index b8edd35e2..000000000
--- a/source/l/libvncserver/libvncserver.15c4f144a3783d9f1f2c976acf9f4d85988fd466.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 15c4f144a3783d9f1f2c976acf9f4d85988fd466 Mon Sep 17 00:00:00 2001
-From: Albert Astals Cid <aacid@kde.org>
-Date: Sun, 5 Jan 2020 19:56:57 +0100
-Subject: [PATCH] rfbShutdownServer: Call rfbClientConnectionGone if no
- backgroundLoop
-
-Otherwise the servers that don't use rfbRunEventLoop don't get
-notified of client disconnections
----
- libvncserver/main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libvncserver/main.c b/libvncserver/main.c
-index b51f0ab6..738a501d 100644
---- a/libvncserver/main.c
-+++ b/libvncserver/main.c
-@@ -1152,6 +1152,8 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
-       write(currentCl->pipe_notify_client_thread[1], "\x00", 1);
-       /* And wait for it to finish. */
-       pthread_join(currentCl->client_thread, NULL);
-+    } else {
-+      rfbClientConnectionGone(currentCl);
-     }
- #else
-       rfbClientConnectionGone(currentCl);
diff --git a/source/l/libvncserver/libvncserver.CMAKE_INSTALL_LIBDIR.diff b/source/l/libvncserver/libvncserver.CMAKE_INSTALL_LIBDIR.diff
deleted file mode 100644
index 4271d57cb..000000000
--- a/source/l/libvncserver/libvncserver.CMAKE_INSTALL_LIBDIR.diff
+++ /dev/null
@@ -1,22 +0,0 @@
---- ./CMakeLists.txt.orig	2019-01-06 13:09:30.000000000 -0600
-+++ ./CMakeLists.txt	2019-12-28 13:27:44.893589607 -0600
-@@ -666,8 +666,8 @@
- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libvncclient.pc.cmakein ${CMAKE_CURRENT_BINARY_DIR}/libvncclient.pc @ONLY)
- 
- 
--install_targets(/lib vncserver)
--install_targets(/lib vncclient)
-+install_targets(/${CMAKE_INSTALL_LIBDIR} vncserver)
-+install_targets(/${CMAKE_INSTALL_LIBDIR} vncclient)
- install_files(/include/rfb FILES
-     rfb/keysym.h
-     rfb/rfb.h
-@@ -677,7 +677,7 @@
-     rfb/rfbregion.h
- )
- 
--install_files(/lib/pkgconfig FILES
-+install_files(/${CMAKE_INSTALL_LIBDIR}/pkgconfig FILES
-     libvncserver.pc
-     libvncclient.pc
- )
diff --git a/source/l/libvncserver/libvncserver.SlackBuild b/source/l/libvncserver/libvncserver.SlackBuild
index abf5f6640..5974b6cc6 100755
--- a/source/l/libvncserver/libvncserver.SlackBuild
+++ b/source/l/libvncserver/libvncserver.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=libvncserver
 VERSION=${VERSION:-$(echo LibVNCServer-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
 
@@ -90,9 +90,7 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \+
 
-zcat $CWD/libvncserver.CMAKE_INSTALL_LIBDIR.diff.gz | patch -p1 --verbose || exit 1
-zcat $CWD/libvncserver.d0a76539835d11c0f4723499f8be4bc9c7724eb9.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/libvncserver.15c4f144a3783d9f1f2c976acf9f4d85988fd466.patch.gz | patch -p1 --verbose || exit 1
+#zcat $CWD/libvncserver.CMAKE_INSTALL_LIBDIR.diff.gz | patch -p1 --verbose || exit 1
 
 # Configure, build, and install:
 mkdir cmake-build
diff --git a/source/l/libvncserver/libvncserver.d0a76539835d11c0f4723499f8be4bc9c7724eb9.patch b/source/l/libvncserver/libvncserver.d0a76539835d11c0f4723499f8be4bc9c7724eb9.patch
deleted file mode 100644
index 7ef6ec221..000000000
--- a/source/l/libvncserver/libvncserver.d0a76539835d11c0f4723499f8be4bc9c7724eb9.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From d0a76539835d11c0f4723499f8be4bc9c7724eb9 Mon Sep 17 00:00:00 2001
-From: Rajesh Sahoo <rajesh.sahoo@lge.com>
-Date: Tue, 11 Jun 2019 15:13:04 +0530
-Subject: [PATCH] avoid pthread_join if backgroundLoop is FALSE
-
-client_thread is created depending upon backgroundLoop, but joining
-without checking for same condition. so we are trying to join a garbage
-thread_id.
----
- libvncserver/main.c | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/libvncserver/main.c b/libvncserver/main.c
-index d3cd9b1e..772fb18f 100644
---- a/libvncserver/main.c
-+++ b/libvncserver/main.c
-@@ -1112,6 +1112,7 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
-       }
- 
- #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
-+    if(currentCl->screen->backgroundLoop) {
-       /*
- 	Notify the thread. This simply writes a NULL byte to the notify pipe in order to get past the select()
- 	in clientInput(), the loop in there will then break because the rfbCloseClient() above has set
-@@ -1120,6 +1121,7 @@ void rfbShutdownServer(rfbScreenInfoPtr screen,rfbBool disconnectClients) {
-       write(currentCl->pipe_notify_client_thread[1], "\x00", 1);
-       /* And wait for it to finish. */
-       pthread_join(currentCl->client_thread, NULL);
-+    }
- #else
-       rfbClientConnectionGone(currentCl);
- #endif
-
diff --git a/source/n/libnetfilter_queue/libnetfilter_queue.SlackBuild b/source/n/libnetfilter_queue/libnetfilter_queue.SlackBuild
index 14371321a..031861b32 100755
--- a/source/n/libnetfilter_queue/libnetfilter_queue.SlackBuild
+++ b/source/n/libnetfilter_queue/libnetfilter_queue.SlackBuild
@@ -87,10 +87,6 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-static=no \
   --build=$ARCH-slackware-linux || exit 1
 
-# Disable broken doxygen that doesn't generate anything anyway:
-echo "all:" > doxygen/Makefile
-echo "install:" >> doxygen/Makefile
-
 make $NUMJOBS || make || exit 1
 make install DESTDIR=$PKG || exit 1
 
diff --git a/source/x/vulkan-sdk/fetch-sources.sh b/source/x/vulkan-sdk/fetch-sources.sh
index daa83a632..2bf737c37 100755
--- a/source/x/vulkan-sdk/fetch-sources.sh
+++ b/source/x/vulkan-sdk/fetch-sources.sh
@@ -27,8 +27,8 @@
 #
 # Example:  VERSION=1.1.92.1 ./fetch-sources.sh
 
-VERSION=${VERSION:-1.2.135.0}
-BRANCH=${BRANCH:-sdk-1.2.135}
+VERSION=${VERSION:-1.2.141.0}
+BRANCH=${BRANCH:-sdk-1.2.141}
 
 rm -rf Vulkan-*-*.tar.?z glslang* SPIRV-Tools* SPIRV-Headers* \
 	Vulkan-Headers-sdk-${VERSION}* \
diff --git a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
index 0c2a33b0b..72d86df77 100755
--- a/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
+++ b/source/x/vulkan-sdk/vulkan-sdk.SlackBuild
@@ -156,6 +156,9 @@ for file in GLSL.std.450.h spirv.h spirv.hpp spirv.hpp11 spirv.json \
   fi
 done
 unset HEADER_SOURCE_DIR
+# This location is checked as well, so link it:
+mkdir -p $PKG/usr/include/spirv
+( cd $PKG/usr/include/spirv ; ln -sf ../vulkan unified1 )
 
 cd $TMP
 tar xvf $CWD/Vulkan-Loader-sdk-$VERSION.tar.?z || exit 1
diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild
index 68d9e2984..25322d6c6 100755
--- a/source/xap/xlockmore/xlockmore.SlackBuild
+++ b/source/xap/xlockmore/xlockmore.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=xlockmore
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then