summaryrefslogtreecommitdiffstats
path: root/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-10-20 18:39:03 +0000
committer Eric Hameleers <alien@slackware.com>2022-10-21 07:00:16 +0200
commitcc9100112bedc83ea2109a4b2aa9ae50b5a97b13 (patch)
treeea54e7d436aa7fc8859fc837cb49d290ee516985 /source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
parent6df89862412c0813623a7e91954f596958bd9537 (diff)
downloadcurrent-cc9100112bedc83ea2109a4b2aa9ae50b5a97b13.tar.gz
current-cc9100112bedc83ea2109a4b2aa9ae50b5a97b13.tar.xz
Thu Oct 20 18:39:03 UTC 202220221020183903
l/harfbuzz-5.3.1-x86_64-1.txz: Upgraded. l/qca-2.3.5-x86_64-1.txz: Upgraded. x/mesa-22.2.2-x86_64-1.txz: Upgraded. x/xorg-server-xwayland-22.1.4-x86_64-1.txz: Upgraded. xap/mozilla-firefox-106.0.1-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/firefox/106.0.1/releasenotes/ xap/mozilla-thunderbird-102.4.0-x86_64-1.txz: Upgraded. This is a bugfix release. For more information, see: https://www.mozilla.org/en-US/thunderbird/102.4.0/releasenotes/
Diffstat (limited to '')
-rwxr-xr-xsource/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild14
1 files changed, 8 insertions, 6 deletions
diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
index b0da0fe1d..06948306c 100755
--- a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
+++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2016, 2018, 2019, 2022 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xorg-server-xwayland
SRCNAM=xwayland
VERSION=${VERSION:-$(echo $SRCNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Default font paths to be used by the X server:
DEF_FONTPATH="/usr/share/fonts/misc,/usr/share/fonts/local,/usr/share/fonts/TTF,/usr/share/fonts/OTF,/usr/share/fonts/Type1,/usr/share/fonts/CID,/usr/share/fonts/75dpi/:unscaled,/usr/share/fonts/100dpi/:unscaled,/usr/share/fonts/75dpi,/usr/share/fonts/100dpi,/usr/share/fonts/cyrillic"
@@ -80,10 +80,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \+
-# Patch more security issues:
-zcat $CWD/CVE-2022-3550.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/CVE-2022-3551.patch.gz | patch -p1 --verbose || exit 1
-
# Configure, build, and install:
export CFLAGS="$SLKCFLAGS"
export CXXFLAGS="$SLKCFLAGS"
@@ -155,6 +151,12 @@ if [ -r ChangeLog ]; then
touch -r ChangeLog $DOCSDIR/ChangeLog
fi
+# Relocate some docs:
+mv $PKG/usr/share/doc/xorg-server/* $PKG/usr/doc/$PKGNAM-$VERSION
+rmdir $PKG/usr/share/doc/xorg-server
+rmdir $PKG/usr/share/doc
+rmdir $PKG/usr/share
+
mkdir -p $PKG/install
cat $CWD/slack-desc > $PKG/install/slack-desc