aboutsummaryrefslogtreecommitdiff
path: root/system/xvfb-run/xvfb-run.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'system/xvfb-run/xvfb-run.SlackBuild')
-rw-r--r--system/xvfb-run/xvfb-run.SlackBuild45
1 files changed, 30 insertions, 15 deletions
diff --git a/system/xvfb-run/xvfb-run.SlackBuild b/system/xvfb-run/xvfb-run.SlackBuild
index 741732e880..a9b4585db2 100644
--- a/system/xvfb-run/xvfb-run.SlackBuild
+++ b/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 <urchlay@slackware.uk>
# 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