From 644b0e3fa844fcfeeaa030cbb56abe3fcada591f Mon Sep 17 00:00:00 2001
From: "B. Watson" <urchlay@slackware.uk>
Date: Thu, 12 Jan 2023 14:17:12 -0500
Subject: [PATCH] desktop/xpra: Updated for version 4.4.3.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 desktop/xpra/mkdoc.sh        |  2 +-
 desktop/xpra/xpra.SlackBuild | 23 +++++++++++++++++++++--
 desktop/xpra/xpra.info       | 10 +++++-----
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/desktop/xpra/mkdoc.sh b/desktop/xpra/mkdoc.sh
index b5324851fa..f08e745fd5 100644
--- a/desktop/xpra/mkdoc.sh
+++ b/desktop/xpra/mkdoc.sh
@@ -12,7 +12,7 @@ source ./xpra.info
 OUTDIR=xpra-$VERSION-prebuilt-docs
 TARBALL=$OUTDIR.tar.xz
 
-RPMFILE=xpra-common-4.3-10.el8.noarch.rpm
+RPMFILE=xpra-common-4.4.3-10.el8.noarch.rpm
 URL=https://www.xpra.org/dists/CentOS/8/x86_64/$RPMFILE
 
 # only download the file if we don't already have it.
diff --git a/desktop/xpra/xpra.SlackBuild b/desktop/xpra/xpra.SlackBuild
index 5635d9f4a4..d1becaa397 100644
--- a/desktop/xpra/xpra.SlackBuild
+++ b/desktop/xpra/xpra.SlackBuild
@@ -6,14 +6,15 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20230112 bkw: update for v4.4.3.
 # 20221217 bkw: BUILD=2.
 # - fix paths in config file (do not include $PKG).
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xpra
-VERSION=${VERSION:-4.3}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-4.4.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -51,11 +52,16 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} \+
 
+# setup.py is slightly broken...
+patch -p1 < $CWD/setup_cuda_bin.diff
+
 sed -i 's,"share/man","man",' setup.py
 
 # without-strict turns off -Werror. without-docs because we don't want
 # pandoc *and its 139 deps* as a dependency. Include prebuilt docs
 # instead.
+# 20230112 bkw: pandoc now has 196 deps... Could use pandoc-bin, but
+# it doesn't do 32-bit. Still using prebuilt docs for now.
 python3 setup.py install \
   --root=$PKG \
   --without-docs \
@@ -65,6 +71,19 @@ python3 setup.py install \
 # 20221217 bkw: grrr. $PKG getting hardcoded in config file.
 sed -i "s,$PKG,,g" $PKG/etc/xpra/conf.d/55_server_x11.conf
 
+# 20230112 bkw: a few things are getting installed in the wrong place.
+mkdir -p $PKG/lib
+mv $PKG/usr/lib/udev $PKG/lib
+if [ -d $PKG/usr/lib64 ]; then
+  mv $PKG/usr/lib/cups $PKG/usr/lib64
+fi
+
+# /usr/lib/{sysusers.d,tmpfiles.d} are for systemd. Apparently they
+# are in the correct place, I'll leave them there (they won't hurt
+# anything and apparently there are Slackware derivatives that use
+# systemd).
+# rm -rf $PKG/usr/lib/{sysusers.d,tmpfiles.d}
+
 # This is *much* faster than using 'file' to classify them.
 find $PKG/usr/lib* -name '*.so' | xargs strip --strip-unneeded
 
diff --git a/desktop/xpra/xpra.info b/desktop/xpra/xpra.info
index 138c1167b5..22a42352c7 100644
--- a/desktop/xpra/xpra.info
+++ b/desktop/xpra/xpra.info
@@ -1,10 +1,10 @@
 PRGNAM="xpra"
-VERSION="4.3"
+VERSION="4.4.3"
 HOMEPAGE="https://www.xpra.org/"
-DOWNLOAD="https://github.com/Xpra-org/xpra/archive/v4.3/xpra-4.3.tar.gz \
-          https://slackware.uk/~urchlay/src/xpra-4.3-prebuilt-docs.tar.xz"
-MD5SUM="ef0ce6127936088ee2df6e49c4b3d116 \
-        bd0f11b58bc4f02d798af1568b78bb1b"
+DOWNLOAD="https://github.com/Xpra-org/xpra/archive/v4.4.3/xpra-4.4.3.tar.gz \
+          https://slackware.uk/~urchlay/src/xpra-4.4.3-prebuilt-docs.tar.xz"
+MD5SUM="ea3902b22ff8e8e644bfed1234111ce0 \
+        bba809186bfc781c8a8e676c0fed79bb"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""