system/xvfb-run: New maintainer, new source.

Signed-off-by: B. Watson <[email protected]>

Signed-off-by: Willy Sudiarto Raharjo <[email protected]>

system/xvfb-run/README

@@ -1 +1,9 @@
-Run a command in a virtual X server environment.
+xvfb-run (run a command in a virtual X server environment)
+
+xvfb-run is a script using the virtual framebufer X server (xvfb)
+to run X programs from command line. Note that xvfb doesn't actually
+display anything; you won't be able to see or interact with the X
+application.
+
+This can be useful for software that expects to connect to an X server
+as part of its build process.

system/xvfb-run/slack-desc

@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-xvfb-run: xvfb-run (Run a command in a virtual X server environment)
-xvfb-run:
-xvfb-run: xvfb-run is a script using virtual framebufer X server
-xvfb-run: to run X programs from command line.
-xvfb-run:
-xvfb-run:
-xvfb-run:
+xvfb-run: xvfb-run (run a command in a virtual X server environment)
 xvfb-run:
+xvfb-run: xvfb-run is a script using the virtual framebufer X server (xvfb)
+xvfb-run: to run X programs from command line. Note that xvfb doesn't actually
+xvfb-run: display anything; you won't be able to see or interact with the X
+xvfb-run: application.
 xvfb-run:
+xvfb-run: This can be useful for software that expects to connect to an X server
+xvfb-run: as part of its build process.
 xvfb-run:
 xvfb-run:

system/xvfb-run/xvfb-run.SlackBuild

@@ -2,7 +2,8 @@
 
 # Slackware build script for xvfb-run
 
-# Copyright 2020 Jan F, Chadima <jfch.jagda.eu>
+# Copyright 2020 Jan F, Chadima <email removed>
+# Copyright 2024 B. Watson <[email protected]>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,15 +23,32 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #
+
+# 20241216 bkw:
+# - take over maintenance.
+# - switch to our own source tarball.
+# - expand README and slack-desc.
+
 # 20-05-2023: Updated to version 21.1.7 and cleaned up to adhere to 
 # sbopkglint standards. - Bob Funk
 # 20-12-2023: Updated to version 21.1.10
 # 08-05-2024: Updated to version 21.1.12
 
+# 20241216 bkw: Stop the stupid VERSION treadmill. Every new release
+# of Debian's xorg-server package causes a new release of xvfb, which
+# includes xvfb-run, *unchanged* from the previous version's (at least,
+# xvfb-run hasn't changed since 2018). This sucks because the download
+# URL we used was the .deb package, and they don't keep old versions. So
+# this script kept breaking, even though the actual code it packages is
+# the same. From now on, this will use a source tarball I create, and
+# won't need constant version updates.
+# VERSION is the date of the last change to either xvfb-run or xvfb-run.1
+# from Debian's changelog.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=xvfb-run
-VERSION=${VERSION:-21.1.12}
+VERSION=${VERSION:-20200114}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -52,22 +70,19 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
-ar x $CWD/xvfb_$VERSION-*.deb
-cd $PKG
-tar xvf $TMP/$PRGNAM-$VERSION/data.tar.xz
+mkdir -p $PKG/usr/{bin,man/man1}
+install -o root -g root -m0755 $PRGNAM $PKG/usr/bin/$PRGNAM
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
-rm -f usr/bin/Xvfb
-mv usr/share/* usr
-rmdir usr/share
-rm -f usr/doc/xvfb/changelog*
-mv usr/doc/xvfb usr/doc/$PRGNAM-$VERSION
-rm -f usr/man/man1/Xvfb.1.gz
-mkdir install
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cat README > $PKGDOC/README
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
 
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-cat $CWD/slack-desc > install/slack-desc
+mkdir $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE

system/xvfb-run/xvfb-run.info

@@ -1,10 +1,10 @@
 PRGNAM="xvfb-run"
-VERSION="21.1.12"
+VERSION="20200114"
 HOMEPAGE="https://packages.gentoo.org/packages/x11-misc/xvfb-run"
-DOWNLOAD="http://ftp.us.debian.org/debian/pool/main/x/xorg-server/xvfb_21.1.12-1_i386.deb"
-MD5SUM="692c648ce01220b6dff51372e733735f"
+DOWNLOAD="https://slackware.uk/~urchlay/src/xvfb-run-20200114.tar.gz"
+MD5SUM="ea695665a98ee7042445f683dbcef2a2"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Bob Funk"
-EMAIL="[email protected]"
+MAINTAINER="B. Watson"
+EMAIL="[email protected]"