summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
Diffstat (limited to 'source')
-rwxr-xr-xsource/a/aaa_libraries/aaa_libraries.SlackBuild6
-rw-r--r--source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/README4
-rw-r--r--source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/glib-dependencies (renamed from source/a/aaa_libraries/symlinks-to-tracked-libs-tmp)5
-rw-r--r--source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c-68.26
-rw-r--r--source/a/aaa_libraries/tracked-files-tmp.d/README (renamed from source/a/aaa_libraries/tracked-files-tmp)1
-rw-r--r--source/a/aaa_libraries/tracked-files-tmp.d/boost-1.75.039
-rw-r--r--source/a/glibc-zoneinfo/doinst.sh2
-rwxr-xr-xsource/a/less/less.SlackBuild2
-rw-r--r--source/a/pkgtools/manpages/pkgtool.82
-rwxr-xr-xsource/a/pkgtools/pkgtools.SlackBuild2
-rw-r--r--source/a/pkgtools/scripts/upgradepkg24
-rwxr-xr-xsource/a/sdparm/sdparm.SlackBuild2
-rwxr-xr-xsource/a/udisks/udisks.SlackBuild2
-rwxr-xr-xsource/a/xfsprogs/xfsprogs.SlackBuild2
-rwxr-xr-xsource/ap/pamixer/pamixer.SlackBuild2
-rwxr-xr-xsource/ap/sqlite/sqlite.SlackBuild2
-rwxr-xr-xsource/d/Cython/Cython.SlackBuild2
-rw-r--r--source/kde/kde/build/kig2
-rw-r--r--source/kde/kde/build/krita2
-rw-r--r--source/kde/kde/build/plasma-workspace2
-rw-r--r--source/kde/kde/patch/plasma-workspace.patch3
-rw-r--r--source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch30
-rw-r--r--source/kde/kde/post-install/plasma-workspace.post-install6
-rwxr-xr-xsource/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild2
-rwxr-xr-xsource/l/boost/boost.SlackBuild2
-rw-r--r--source/l/boost/slack-desc2
-rwxr-xr-xsource/l/cryfs/cryfs.SlackBuild2
-rwxr-xr-xsource/l/harfbuzz/harfbuzz.SlackBuild2
-rwxr-xr-xsource/l/icu4c/icu4c.SlackBuild2
-rwxr-xr-xsource/l/libdvdread/libdvdread.SlackBuild2
-rwxr-xr-xsource/l/libgpod/libgpod.SlackBuild2
-rwxr-xr-xsource/l/libical/libical.SlackBuild2
-rwxr-xr-xsource/l/libqalculate/libqalculate.SlackBuild2
-rwxr-xr-xsource/l/libvisio/libvisio.SlackBuild2
-rwxr-xr-xsource/l/mozilla-nss/mozilla-nss.SlackBuild2
-rwxr-xr-xsource/l/openexr/openexr.SlackBuild2
-rwxr-xr-xsource/l/qt5-webkit/qt5-webkit.SlackBuild2
-rwxr-xr-xsource/l/qt5/qt5.SlackBuild6
-rwxr-xr-xsource/l/vte/vte.SlackBuild2
-rwxr-xr-xsource/n/daemon/daemon.SlackBuild115
-rw-r--r--source/n/daemon/doinst.sh14
-rw-r--r--source/n/daemon/slack-desc20
-rwxr-xr-xsource/n/dovecot/dovecot.SlackBuild2
-rwxr-xr-xsource/n/php/php.SlackBuild2
-rwxr-xr-xsource/n/postfix/postfix.SlackBuild2
-rwxr-xr-xsource/n/samba/samba.SlackBuild2
-rwxr-xr-xsource/n/tin/tin.SlackBuild2
-rwxr-xr-xsource/t/texlive/texlive.SlackBuild2
-rw-r--r--source/x/egl-wayland/10_nvidia_wayland.json6
-rwxr-xr-xsource/x/egl-wayland/egl-wayland.SlackBuild143
-rw-r--r--source/x/egl-wayland/egl-wayland.url1
-rw-r--r--source/x/egl-wayland/slack-desc20
-rwxr-xr-xsource/x/eglexternalplatform/eglexternalplatform.SlackBuild92
-rw-r--r--source/x/eglexternalplatform/eglexternalplatform.url1
-rw-r--r--source/x/eglexternalplatform/slack-desc20
-rw-r--r--source/x/x11/configure/xorg-server10
-rw-r--r--source/x/x11/makepkg/xorg-server31
-rw-r--r--source/x/xorg-server-xwayland/slack-desc19
-rwxr-xr-xsource/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild157
-rwxr-xr-xsource/xap/MPlayer/MPlayer.SlackBuild4
-rwxr-xr-xsource/xap/mozilla-firefox/mozilla-firefox.SlackBuild2
61 files changed, 779 insertions, 74 deletions
diff --git a/source/a/aaa_libraries/aaa_libraries.SlackBuild b/source/a/aaa_libraries/aaa_libraries.SlackBuild
index 81461a42c..37ae5f181 100755
--- a/source/a/aaa_libraries/aaa_libraries.SlackBuild
+++ b/source/a/aaa_libraries/aaa_libraries.SlackBuild
@@ -23,7 +23,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=aaa_libraries
VERSION=${VERSION:-15.0}
-BUILD=${BUILD:-5}
+BUILD=${BUILD:-6}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -89,7 +89,7 @@ cat $CWD/tracked-files \
)
done
-cat $CWD/symlinks-to-tracked-libs-tmp \
+cat $CWD/symlinks-to-tracked-libs-tmp.d/* \
| grep -v "^#" | grep -v "^$" \
| sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
-e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
@@ -105,7 +105,7 @@ cat $CWD/symlinks-to-tracked-libs-tmp \
)
done
-cat $CWD/tracked-files-tmp \
+cat $CWD/tracked-files-tmp.d/* \
| grep -v "^#" | grep -v "^$" \
| sed -e "s#^/lib/#/lib${LIBDIRSUFFIX}/#" \
-e "s#^/usr/lib/#/usr/lib${LIBDIRSUFFIX}/#" \
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/README b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/README
new file mode 100644
index 000000000..2e0d30830
--- /dev/null
+++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/README
@@ -0,0 +1,4 @@
+# This file lists shared library symlinks for libraries we would
+# like to keep copies of temporarily until we can recompile
+# everything that's still using them. Once that happens, they'll
+# be dropped from this package.
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/glib-dependencies
index bf2e2e0ef..163f3f679 100644
--- a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp
+++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/glib-dependencies
@@ -1,8 +1,3 @@
-# This file lists shared library symlinks for libraries we would
-# like to keep copies of temporarily until we can recompile
-# everything that's still using them. Once that happens, they'll
-# be dropped from this package.
-#
# We need these libraries here or we won't be able to recompile gcc
# after any of them get a shared library .so-version bump:
/usr/lib/libisl.so.23
diff --git a/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c-68.2 b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c-68.2
new file mode 100644
index 000000000..5f831a8ee
--- /dev/null
+++ b/source/a/aaa_libraries/symlinks-to-tracked-libs-tmp.d/icu4c-68.2
@@ -0,0 +1,6 @@
+/usr/lib/libicudata.so.68
+/usr/lib/libicui18n.so.68
+/usr/lib/libicuio.so.68
+/usr/lib/libicutest.so.68
+/usr/lib/libicutu.so.68
+/usr/lib/libicuuc.so.68
diff --git a/source/a/aaa_libraries/tracked-files-tmp b/source/a/aaa_libraries/tracked-files-tmp.d/README
index 58b6c36d1..671782ec3 100644
--- a/source/a/aaa_libraries/tracked-files-tmp
+++ b/source/a/aaa_libraries/tracked-files-tmp.d/README
@@ -2,4 +2,3 @@
# copies of temporarily until we can recompile everything that's
# still using them. Once that happens, they'll be dropped from
# this package.
-
diff --git a/source/a/aaa_libraries/tracked-files-tmp.d/boost-1.75.0 b/source/a/aaa_libraries/tracked-files-tmp.d/boost-1.75.0
new file mode 100644
index 000000000..5ec36054c
--- /dev/null
+++ b/source/a/aaa_libraries/tracked-files-tmp.d/boost-1.75.0
@@ -0,0 +1,39 @@
+/usr/lib/libboost_atomic.so.1.75.0
+/usr/lib/libboost_chrono.so.1.75.0
+/usr/lib/libboost_container.so.1.75.0
+/usr/lib/libboost_context.so.1.75.0
+/usr/lib/libboost_contract.so.1.75.0
+/usr/lib/libboost_coroutine.so.1.75.0
+/usr/lib/libboost_date_time.so.1.75.0
+/usr/lib/libboost_fiber.so.1.75.0
+/usr/lib/libboost_filesystem.so.1.75.0
+/usr/lib/libboost_graph.so.1.75.0
+/usr/lib/libboost_iostreams.so.1.75.0
+/usr/lib/libboost_json.so.1.75.0
+/usr/lib/libboost_locale.so.1.75.0
+/usr/lib/libboost_log.so.1.75.0
+/usr/lib/libboost_log_setup.so.1.75.0
+/usr/lib/libboost_math_c99.so.1.75.0
+/usr/lib/libboost_math_c99f.so.1.75.0
+/usr/lib/libboost_math_c99l.so.1.75.0
+/usr/lib/libboost_math_tr1.so.1.75.0
+/usr/lib/libboost_math_tr1f.so.1.75.0
+/usr/lib/libboost_math_tr1l.so.1.75.0
+/usr/lib/libboost_nowide.so.1.75.0
+/usr/lib/libboost_prg_exec_monitor.so.1.75.0
+/usr/lib/libboost_program_options.so.1.75.0
+/usr/lib/libboost_python27.so.1.75.0
+/usr/lib/libboost_python39.so.1.75.0
+/usr/lib/libboost_random.so.1.75.0
+/usr/lib/libboost_regex.so.1.75.0
+/usr/lib/libboost_serialization.so.1.75.0
+/usr/lib/libboost_stacktrace_addr2line.so.1.75.0
+/usr/lib/libboost_stacktrace_basic.so.1.75.0
+/usr/lib/libboost_stacktrace_noop.so.1.75.0
+/usr/lib/libboost_system.so.1.75.0
+/usr/lib/libboost_thread.so.1.75.0
+/usr/lib/libboost_timer.so.1.75.0
+/usr/lib/libboost_type_erasure.so.1.75.0
+/usr/lib/libboost_unit_test_framework.so.1.75.0
+/usr/lib/libboost_wave.so.1.75.0
+/usr/lib/libboost_wserialization.so.1.75.0
diff --git a/source/a/glibc-zoneinfo/doinst.sh b/source/a/glibc-zoneinfo/doinst.sh
index eb776e2ff..debfd490a 100644
--- a/source/a/glibc-zoneinfo/doinst.sh
+++ b/source/a/glibc-zoneinfo/doinst.sh
@@ -6,7 +6,7 @@
# bugs these days. We're going to make /etc/localtime a symlink just
# like everyone else does so that programs that expect it to be a link
# can fetch the timezone without requiring any special patches.
-# If you insist on making /usr a seperate partition, you might want to
+# If you insist on making /usr a separate partition, you might want to
# put the pointed-to directories and timezone file in your empty /usr
# directory so that it is available before the real /usr is mounted.
# Still not recommended though.
diff --git a/source/a/less/less.SlackBuild b/source/a/less/less.SlackBuild
index 56d8703ef..6db39b350 100755
--- a/source/a/less/less.SlackBuild
+++ b/source/a/less/less.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=less
VERSION=${VERSION:-$(echo less-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/a/pkgtools/manpages/pkgtool.8 b/source/a/pkgtools/manpages/pkgtool.8
index 56e392176..0faf56013 100644
--- a/source/a/pkgtools/manpages/pkgtool.8
+++ b/source/a/pkgtools/manpages/pkgtool.8
@@ -52,7 +52,7 @@ is run during the initial system installation.
Feel free to try them, but be careful.
.TP
.B \--sets #A#B#C#
-Install the disk sets A, B, C. Seperate the disk set names by '#' symbols.
+Install the disk sets A, B, C. Separate the disk set names by '#' symbols.
.TP
.B \--source_mounted
When this flag is present,
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index cca59234c..aac185ee3 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
# *** UPDATE THESE WITH EACH BUILD:
VERSION=15.0
ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-37}
+BUILD=${BUILD:-38}
# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
# the name of the created package would be, and then exit. This information
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index d71ca4b03..62d05440f 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -262,11 +262,11 @@ for ARG; do
echo "$NEW would be installed (new package)."
else
if [ $PLAINTERSE ]; then
- /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
+ $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
elif [ $INFOBOX ]; then
- /sbin/installpkg --infobox $INCOMINGDIR/$NNAME
+ $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME
elif [ $TERSE ]; then
- OUTPUTLINE="$(/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
+ OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
( flock 9 || exit 11
echo "Installing: ${OUTPUTLINE}"
) 9> $INSTLOCKDIR/outputline.lock
@@ -278,7 +278,7 @@ for ARG; do
+==============================================================================
EOF
- /sbin/installpkg $INCOMINGDIR/$NNAME
+ $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME
fi
fi
fi
@@ -356,26 +356,26 @@ EOF
# Next, the new package is pre-installed:
if [ "$VERBOSE" = "verbose" ]; then
if ! [ $TERSE ]; then
- /sbin/installpkg $INCOMINGDIR/$NNAME
+ $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME
RETCODE=$?
else
- /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+ $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
RETCODE=$?
fi
else
if [ $PLAINTERSE ]; then
- /sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
+ $ROOT/sbin/installpkg --terse --terselength $TERSELENGTH $INCOMINGDIR/$NNAME
elif [ $INFOBOX ]; then
- /sbin/installpkg --infobox $INCOMINGDIR/$NNAME
+ $ROOT/sbin/installpkg --infobox $INCOMINGDIR/$NNAME
elif [ $TERSE ]; then
- OUTPUTLINE="$(/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
+ OUTPUTLINE="$($ROOT/sbin/installpkg --terse --terselength $(expr $TERSELENGTH - 12) $INCOMINGDIR/$NNAME)"
RETCODE=$?
( flock 9 || exit 11
echo "Upgrading: ${OUTPUTLINE}"
) 9> $INSTLOCKDIR/outputline.lock
else
echo "Pre-installing package $NEW..."
- /sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
+ $ROOT/sbin/installpkg $INCOMINGDIR/$NNAME 1> /dev/null
RETCODE=$?
fi
fi
@@ -406,9 +406,9 @@ EOF
# shift location, so we should always reinstall as the final step:
if [ ! "$NOT_PARANOID" = "true" ]; then
if ! [ $TERSE ]; then
- /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME
+ $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME
else
- /sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null
+ $ROOT/sbin/installpkg --no-overwrite $INCOMINGDIR/$NNAME 1> /dev/null
fi
fi
! [ $TERSE ] && echo "Package $OLD upgraded with new package $INCOMINGDIR/$NNAME."
diff --git a/source/a/sdparm/sdparm.SlackBuild b/source/a/sdparm/sdparm.SlackBuild
index 6bd5e3c2e..6503818af 100755
--- a/source/a/sdparm/sdparm.SlackBuild
+++ b/source/a/sdparm/sdparm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sdparm
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/a/udisks/udisks.SlackBuild b/source/a/udisks/udisks.SlackBuild
index c91939525..66420a2b1 100755
--- a/source/a/udisks/udisks.SlackBuild
+++ b/source/a/udisks/udisks.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=udisks
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-8}
+BUILD=${BUILD:-9}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/a/xfsprogs/xfsprogs.SlackBuild b/source/a/xfsprogs/xfsprogs.SlackBuild
index fe5d5e8f9..1fbf978d3 100755
--- a/source/a/xfsprogs/xfsprogs.SlackBuild
+++ b/source/a/xfsprogs/xfsprogs.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xfsprogs
VERSION=${VERSION:-$(echo xfsprogs-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/ap/pamixer/pamixer.SlackBuild b/source/ap/pamixer/pamixer.SlackBuild
index 0d1c4dd07..ad39298dc 100755
--- a/source/ap/pamixer/pamixer.SlackBuild
+++ b/source/ap/pamixer/pamixer.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=pamixer
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/ap/sqlite/sqlite.SlackBuild b/source/ap/sqlite/sqlite.SlackBuild
index 6e4df6f07..781f7d40a 100755
--- a/source/ap/sqlite/sqlite.SlackBuild
+++ b/source/ap/sqlite/sqlite.SlackBuild
@@ -26,7 +26,7 @@
cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=sqlite
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# First, convert the .zip file if needed:
if ls *.zip 1> /dev/null 2> /dev/null ; then
diff --git a/source/d/Cython/Cython.SlackBuild b/source/d/Cython/Cython.SlackBuild
index 843f3ef18..d2893f072 100755
--- a/source/d/Cython/Cython.SlackBuild
+++ b/source/d/Cython/Cython.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=Cython
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/kde/kde/build/kig b/source/kde/kde/build/kig
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/kig
+++ b/source/kde/kde/build/kig
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/build/krita b/source/kde/kde/build/krita
index 0cfbf0888..00750edc0 100644
--- a/source/kde/kde/build/krita
+++ b/source/kde/kde/build/krita
@@ -1 +1 @@
-2
+3
diff --git a/source/kde/kde/build/plasma-workspace b/source/kde/kde/build/plasma-workspace
index d00491fd7..0cfbf0888 100644
--- a/source/kde/kde/build/plasma-workspace
+++ b/source/kde/kde/build/plasma-workspace
@@ -1 +1 @@
-1
+2
diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch
new file mode 100644
index 000000000..975f72785
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace.patch
@@ -0,0 +1,3 @@
+# Set GTK_BACKEND=x11 in a wayland session
+# Works around missing window decorations and broken config file reading
+cat $CWD/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch b/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
new file mode 100644
index 000000000..8bd445da7
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace/0001-Set-GTK_BACKEND-x11-in-a-wayland-session.patch
@@ -0,0 +1,30 @@
+From 3deadbfcdf776eb0c994bb4d719e601160943bfa Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Wed, 28 Aug 2019 15:09:49 +0200
+Subject: [PATCH] Set GTK_BACKEND=x11 in a wayland session
+
+Works around missing window decorations and broken config file reading
+---
+ startkde/startplasma-waylandsession.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
+index 87c71c6b3..5d0b3f65f 100644
+--- a/startkde/startplasma-waylandsession.cpp
++++ b/startkde/startplasma-waylandsession.cpp
+@@ -45,6 +45,11 @@ int main(int /*argc*/, char** /*argv*/)
+ out << "startplasma-waylandsession: Starting up...";
+
+ if (qEnvironmentVariableIsSet("DISPLAY")) {
++ // GTK3 uses the wayland backend by default, but its implementation is not correct
++ // enough to work well here. Window decorations are missing, for instance.
++ if (!qEnvironmentVariableIsSet("GDK_BACKEND")) {
++ qputenv("GDK_BACKEND", "x11");
++ }
+ setupX11();
+ } else {
+ qWarning() << "running kwin without Xwayland support";
+--
+2.22.0
+
+
diff --git a/source/kde/kde/post-install/plasma-workspace.post-install b/source/kde/kde/post-install/plasma-workspace.post-install
index 65d727fcb..4ba279a20 100644
--- a/source/kde/kde/post-install/plasma-workspace.post-install
+++ b/source/kde/kde/post-install/plasma-workspace.post-install
@@ -14,6 +14,12 @@ cat $CWD/post-install/plasma-workspace/scripts/startkwayland \
> $PKG/usr/bin/startkwayland
chmod 0755 $PKG/usr/bin/startkwayland
+# Install custom "full wayland" session
+pushd $PKG/usr/share/wayland-sessions/
+sed '/^Name/d;s/^Exec=/Exec=env GDK_BACKEND=wayland QT_QPA_PLATFORM=wayland /' plasmawayland.desktop > z_plasmafullwayland.desktop
+echo 'Name=Plasma (Full Wayland)' >> z_plasmafullwayland.desktop
+popd
+
# Add a "fail-safe" version of KDE Plasma desktop session.
# Prefix the name with "z_" because SDDM is braindead:
mkdir -p $PKG/usr/share/xsessions
diff --git a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild
index b9995f592..b7993bdad 100755
--- a/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild
+++ b/source/l/adwaita-icon-theme/adwaita-icon-theme.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=adwaita-icon-theme
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/boost/boost.SlackBuild b/source/l/boost/boost.SlackBuild
index a11d749cb..41e0ccbb8 100755
--- a/source/l/boost/boost.SlackBuild
+++ b/source/l/boost/boost.SlackBuild
@@ -30,7 +30,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=boost
VERSION=${VERSION:-$(echo $PKGNAM_*.tar.?z | rev | cut -f 3- -d . | rev | cut -f 2- -d _)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
PKG_VERSION=$(echo $VERSION | tr _ .) # Leave this alone
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/boost/slack-desc b/source/l/boost/slack-desc
index 28fe3b49b..50f9fea38 100644
--- a/source/l/boost/slack-desc
+++ b/source/l/boost/slack-desc
@@ -14,6 +14,6 @@ boost: Library. One goal is to establish "existing practice" and provide
boost: reference implementations so that the Boost libraries are suitable
boost: for eventual standardization.
boost:
-boost: Homepage: http://www.boost.org/
+boost: Homepage: https://www.boost.org/
boost:
boost:
diff --git a/source/l/cryfs/cryfs.SlackBuild b/source/l/cryfs/cryfs.SlackBuild
index 11f021f04..007bd1f72 100755
--- a/source/l/cryfs/cryfs.SlackBuild
+++ b/source/l/cryfs/cryfs.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=cryfs
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/harfbuzz/harfbuzz.SlackBuild b/source/l/harfbuzz/harfbuzz.SlackBuild
index 4e0ccddbd..743555f15 100755
--- a/source/l/harfbuzz/harfbuzz.SlackBuild
+++ b/source/l/harfbuzz/harfbuzz.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=harfbuzz
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/icu4c/icu4c.SlackBuild b/source/l/icu4c/icu4c.SlackBuild
index f0d5cf3be..9b2a2f1a9 100755
--- a/source/l/icu4c/icu4c.SlackBuild
+++ b/source/l/icu4c/icu4c.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=icu4c
SRCVER=${SRCVER:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 2- -d . | cut -f 2 -d - | rev)}
VERSION=$(echo $SRCVER | tr _ .)
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/libdvdread/libdvdread.SlackBuild b/source/l/libdvdread/libdvdread.SlackBuild
index 1282459e0..dc41951cb 100755
--- a/source/l/libdvdread/libdvdread.SlackBuild
+++ b/source/l/libdvdread/libdvdread.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libdvdread
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/libgpod/libgpod.SlackBuild b/source/l/libgpod/libgpod.SlackBuild
index c99a8b9c6..6d944bcf0 100755
--- a/source/l/libgpod/libgpod.SlackBuild
+++ b/source/l/libgpod/libgpod.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libgpod
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-9}
+BUILD=${BUILD:-10}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/libical/libical.SlackBuild b/source/l/libical/libical.SlackBuild
index 64225acc9..3dff49df5 100755
--- a/source/l/libical/libical.SlackBuild
+++ b/source/l/libical/libical.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libical
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/libqalculate/libqalculate.SlackBuild b/source/l/libqalculate/libqalculate.SlackBuild
index 82062ea8a..f06cb4de0 100755
--- a/source/l/libqalculate/libqalculate.SlackBuild
+++ b/source/l/libqalculate/libqalculate.SlackBuild
@@ -25,7 +25,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libqalculate
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/libvisio/libvisio.SlackBuild b/source/l/libvisio/libvisio.SlackBuild
index 67cb21110..d37a341a5 100755
--- a/source/l/libvisio/libvisio.SlackBuild
+++ b/source/l/libvisio/libvisio.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=libvisio
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/l/mozilla-nss/mozilla-nss.SlackBuild b/source/l/mozilla-nss/mozilla-nss.SlackBuild
index 582badec9..298ba77ec 100755
--- a/source/l/mozilla-nss/mozilla-nss.SlackBuild
+++ b/source/l/mozilla-nss/mozilla-nss.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-nss
SRCNAM=nss
-VERSION=${VERSION:-3.63}
+VERSION=${VERSION:-3.64}
NSPR=${NSPR:-4.30}
BUILD=${BUILD:-1}
diff --git a/source/l/openexr/openexr.SlackBuild b/source/l/openexr/openexr.SlackBuild
index 286b4fc0f..23549f2a3 100755
--- a/source/l/openexr/openexr.SlackBuild
+++ b/source/l/openexr/openexr.SlackBuild
@@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=openexr
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/qt5-webkit/qt5-webkit.SlackBuild b/source/l/qt5-webkit/qt5-webkit.SlackBuild
index 9a3d58453..6bdd1d890 100755
--- a/source/l/qt5-webkit/qt5-webkit.SlackBuild
+++ b/source/l/qt5-webkit/qt5-webkit.SlackBuild
@@ -28,7 +28,7 @@ PKGNAM=qt5-webkit
SRCNAM=qtwebkit
SRCVER=${SRCVER:-5.212.0-alpha4}
VERSION=$(echo $SRCVER | tr - _)
-BUILD=${BUILD:-6}
+BUILD=${BUILD:-7}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/l/qt5/qt5.SlackBuild b/source/l/qt5/qt5.SlackBuild
index 8697ce82f..ecc2b39f0 100755
--- a/source/l/qt5/qt5.SlackBuild
+++ b/source/l/qt5/qt5.SlackBuild
@@ -31,7 +31,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=qt5
VERSION=$(ls qt-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)
-BUILD=${BUILD:-7}
+BUILD=${BUILD:-8}
PKGSRC=$(echo $VERSION | cut -d - -f 1)
PKGVER=$(echo $VERSION | tr - _)
@@ -196,10 +196,12 @@ export QT_PLUGIN_PATH="${QTDIR}/qtbase/plugins"
-opengl \
-openssl-linked \
-optimized-qmake \
- -qpa xcb \
+ -qpa "xcb;wayland" \
-qt-harfbuzz \
-verbose \
-xcb \
+ -egl \
+ -eglfs \
-nomake examples \
-nomake tests \
-no-mimetype-database \
diff --git a/source/l/vte/vte.SlackBuild b/source/l/vte/vte.SlackBuild
index 40b5aa99e..9e53414bc 100755
--- a/source/l/vte/vte.SlackBuild
+++ b/source/l/vte/vte.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=vte
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/n/daemon/daemon.SlackBuild b/source/n/daemon/daemon.SlackBuild
new file mode 100755
index 000000000..92d56b8d5
--- /dev/null
+++ b/source/n/daemon/daemon.SlackBuild
@@ -0,0 +1,115 @@
+#!/bin/bash
+
+# Copyright 2005-2018 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=daemon
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$(uname -m)" in
+ i?86) ARCH=i586 ;;
+ arm*) readelf /usr/bin/file -A | egrep -q "Tag_CPU.*[4,5]" && ARCH=arm || ARCH=armv7hl ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) ARCH=$(uname -m) ;;
+ esac
+ export ARCH
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+if [ "$ARCH" = "i386" ]; then
+ SLKCFLAGS="-O2 -march=i386 -mcpu=i686"
+elif [ "$ARCH" = "i486" ]; then
+ SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+elif [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686"
+elif [ "$ARCH" = "s390" ]; then
+ SLKCFLAGS="-O2"
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+elif [ "$ARCH" = "armv7hl" ]; then
+ SLKCFLAGS="-O3 -march=armv7-a -mfpu=vfpv3-d16"
+else
+ SLKCFLAGS="-O2"
+fi
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+./configure \
+ --prefix=/usr \
+ --enable-logind
+
+make $NUMJOBS CFLAGS="$SLKCFLAGS" || exit 1
+
+make install DESTDIR=$PKG || exit 1
+make install-daemon-conf DESTDIR=$PKG || exit 1
+make install-daemon-html DESTDIR=$PKG DAEMON_HTMLDIR=/usr/doc/$PKGNAM-$VERSION || exit 1
+
+mv $PKG/etc/daemon.conf $PKG/etc/daemon.conf.new
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ COPYING* INSTALL LICENSE README* REFERENCES \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a CHANGELOG, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r CHANGELOG ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+ cat CHANGELOG | head -n 1000 > $DOCSDIR/CHANGELOG
+ touch -r CHANGELOG $DOCSDIR/CHANGELOG
+fi
+
+mkdir -p $PKG/install
+zcat $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/n/daemon/doinst.sh b/source/n/daemon/doinst.sh
new file mode 100644
index 000000000..bf8f30747
--- /dev/null
+++ b/source/n/daemon/doinst.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+config() {
+ NEW="$1"
+ OLD="`dirname $NEW`/`basename $NEW .new`"
+ # If there's no config file by that name, mv it over:
+ if [ ! -r $OLD ]; then
+ mv $NEW $OLD
+ elif [ "`cat $OLD | md5sum`" = "`cat $NEW | md5sum`" ]; then # toss the redundant copy
+ rm $NEW
+ fi
+ # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/daemon.conf.new
diff --git a/source/n/daemon/slack-desc b/source/n/daemon/slack-desc
new file mode 100644
index 000000000..48da63ba7
--- /dev/null
+++ b/source/n/daemon/slack-desc
@@ -0,0 +1,20 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+
+ |-----handy-ruler------------------------------------------------------|
+daemon: daemon (turns other processes into daemons)
+daemon:
+daemon: Daemon turns other processes into daemons. There are many tasks that
+daemon: need to be performed to correctly set up a daemon process. This can
+daemon: be tedious. Daemon performs these tasks for other processes. This is
+daemon: useful for writing daemons in languages other than C, C++ or Perl
+daemon: (e.g. `/bin/sh`, Java).
+daemon:
+daemon: http://libslack.org/daemon/
+daemon:
+daemon:
diff --git a/source/n/dovecot/dovecot.SlackBuild b/source/n/dovecot/dovecot.SlackBuild
index 1c5dfaff9..7993a195e 100755
--- a/source/n/dovecot/dovecot.SlackBuild
+++ b/source/n/dovecot/dovecot.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=dovecot
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/n/php/php.SlackBuild b/source/n/php/php.SlackBuild
index 74c8d4854..d1d9ac183 100755
--- a/source/n/php/php.SlackBuild
+++ b/source/n/php/php.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=php
VERSION=${VERSION:-$(echo php-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
ALPINE=2.24
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/n/postfix/postfix.SlackBuild b/source/n/postfix/postfix.SlackBuild
index b3cbf888e..3cc6375a9 100755
--- a/source/n/postfix/postfix.SlackBuild
+++ b/source/n/postfix/postfix.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=postfix
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
diff --git a/source/n/samba/samba.SlackBuild b/source/n/samba/samba.SlackBuild
index 0761cb69d..71b6212d2 100755
--- a/source/n/samba/samba.SlackBuild
+++ b/source/n/samba/samba.SlackBuild
@@ -26,7 +26,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=samba
VERSION=${VERSION:-$(echo samba-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
if [ -e $CWD/machine.conf ]; then
. $CWD/machine.conf ]
diff --git a/source/n/tin/tin.SlackBuild b/source/n/tin/tin.SlackBuild
index 0fa8b83c6..69a47bd8c 100755
--- a/source/n/tin/tin.SlackBuild
+++ b/source/n/tin/tin.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=tin
VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
diff --git a/source/t/texlive/texlive.SlackBuild b/source/t/texlive/texlive.SlackBuild
index a31cfcac5..7fa89ebf9 100755
--- a/source/t/texlive/texlive.SlackBuild
+++ b/source/t/texlive/texlive.SlackBuild
@@ -33,7 +33,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=texlive
SOURCEVERSION=${SOURCEVERSION:-20200327}
VERSION=${VERSION:-2020.200608}
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-5}
TMP=${TMP:-/tmp}
PKG=$TMP/package-texlive
diff --git a/source/x/egl-wayland/10_nvidia_wayland.json b/source/x/egl-wayland/10_nvidia_wayland.json
new file mode 100644
index 000000000..c08a64112
--- /dev/null
+++ b/source/x/egl-wayland/10_nvidia_wayland.json
@@ -0,0 +1,6 @@
+{
+ "file_format_version" : "1.0.0",
+ "ICD" : {
+ "library_path" : "libnvidia-egl-wayland.so.1"
+ }
+}
diff --git a/source/x/egl-wayland/egl-wayland.SlackBuild b/source/x/egl-wayland/egl-wayland.SlackBuild
new file mode 100755
index 000000000..4448e0f84
--- /dev/null
+++ b/source/x/egl-wayland/egl-wayland.SlackBuild
@@ -0,0 +1,143 @@
+#!/bin/bash
+
+# Copyright 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=egl-wayland
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i586 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP || exit 1
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --buildtype=release \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
+
+# Install the NVidia ICD file:
+mkdir $PKG/usr/share/egl/egl_external_platform.d/
+cp -a $CWD/10_nvidia_wayland.json $PKG/usr/share/egl/egl_external_platform.d/
+chown root:root $PKG/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json
+chmod 644 $PKG/usr/share/egl/egl_external_platform.d/10_nvidia_wayland.json
+
+# Strip the binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+ ( cd $PKG/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd $manpagedir
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink $eachpage ).gz $eachpage.gz
+ rm $eachpage
+ done
+ gzip -9 *.?
+ )
+ done
+ )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* CREDITS INSTALL NEWS README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/egl-wayland/egl-wayland.url b/source/x/egl-wayland/egl-wayland.url
new file mode 100644
index 000000000..8b3c41756
--- /dev/null
+++ b/source/x/egl-wayland/egl-wayland.url
@@ -0,0 +1 @@
+https://github.com/NVIDIA/egl-wayland
diff --git a/source/x/egl-wayland/slack-desc b/source/x/egl-wayland/slack-desc
new file mode 100644
index 000000000..34cff0ad3
--- /dev/null
+++ b/source/x/egl-wayland/slack-desc
@@ -0,0 +1,20 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+
+ |-----handy-ruler------------------------------------------------------|
+egl-wayland: egl-wayland (Wayland EGL External Platform library)
+egl-wayland:
+egl-wayland: Wayland EGL External Platform library.
+egl-wayland:
+egl-wayland:
+egl-wayland:
+egl-wayland:
+egl-wayland:
+egl-wayland:
+egl-wayland:
+egl-wayland:
diff --git a/source/x/eglexternalplatform/eglexternalplatform.SlackBuild b/source/x/eglexternalplatform/eglexternalplatform.SlackBuild
new file mode 100755
index 000000000..7c6bf4d49
--- /dev/null
+++ b/source/x/eglexternalplatform/eglexternalplatform.SlackBuild
@@ -0,0 +1,92 @@
+#!/bin/bash
+
+# Copyright 2021 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
+PKGNAM=eglexternalplatform
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i586 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP
+rm -rf $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
+
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+mkdir -p $PKG/usr/include/
+cp -a interface/eglexternalplatform.h $PKG/usr/include/
+cp -a interface/eglexternalplatformversion.h $PKG/usr/include/
+mkdir -p $PKG/usr/share/pkgconfig/
+cp -a eglexternalplatform.pc $PKG/usr/share/pkgconfig/
+chown -R root:root $PKG/usr/include $PKG/usr/share/pkgconfig
+chmod 644 $PKG/usr/include/* $PKG/usr/share/pkgconfig/*
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* INSTALL NEWS README* THANKS TODO \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/*-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+# Build the package:
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/x/eglexternalplatform/eglexternalplatform.url b/source/x/eglexternalplatform/eglexternalplatform.url
new file mode 100644
index 000000000..012d3b4d6
--- /dev/null
+++ b/source/x/eglexternalplatform/eglexternalplatform.url
@@ -0,0 +1 @@
+https://github.com/NVIDIA/eglexternalplatform
diff --git a/source/x/eglexternalplatform/slack-desc b/source/x/eglexternalplatform/slack-desc
new file mode 100644
index 000000000..417bae228
--- /dev/null
+++ b/source/x/eglexternalplatform/slack-desc
@@ -0,0 +1,20 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
+# customary to leave one space after the ':'.
+
+
+ |-----handy-ruler------------------------------------------------------|
+eglexternalplatform: eglexternalplatform (EGL External Platform Interface headers)
+eglexternalplatform:
+eglexternalplatform: The header files for EGL External Platform Interface.
+eglexternalplatform:
+eglexternalplatform:
+eglexternalplatform:
+eglexternalplatform:
+eglexternalplatform:
+eglexternalplatform:
+eglexternalplatform:
+eglexternalplatform:
diff --git a/source/x/x11/configure/xorg-server b/source/x/x11/configure/xorg-server
index bd3adf4fe..c107644e0 100644
--- a/source/x/x11/configure/xorg-server
+++ b/source/x/x11/configure/xorg-server
@@ -1,4 +1,12 @@
+# Build Wayland X Server (currently built as standalone):
+BUILD_XWAYLAND=NO
+
# Servers to build:
+if [ "$BUILD_XWAYLAND" = "NO" ]; then
+ XWAYLAND_OPTION="--disable-xwayland"
+else
+ XWAYLAND_OPTION="--enable-xwayland"
+fi
BUILD_SERVERS="--enable-xorg \
--enable-dmx \
--enable-xvfb \
@@ -6,7 +14,7 @@ BUILD_SERVERS="--enable-xorg \
--enable-glamor \
--enable-kdrive \
--enable-xephyr \
- --enable-xwayland \
+ $XWAYLAND_OPTION \
--enable-config-udev \
--disable-config-hal \
--disable-systemd-logind"
diff --git a/source/x/x11/makepkg/xorg-server b/source/x/x11/makepkg/xorg-server
index cc4f4f78d..1f5faf3c4 100644
--- a/source/x/x11/makepkg/xorg-server
+++ b/source/x/x11/makepkg/xorg-server
@@ -29,16 +29,18 @@ cat $CWD/slack-desc/xorg-server-xephyr > ${SLACK_X_BUILD_DIR}/package-xorg-serve
cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xephyr
/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
-rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
-mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
-mv $PKG/usr/bin/Xwayland ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
-# No man page yet...
-#mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
-#mv $PKG/usr/man/man1/Xwayland.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
-mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install
-cat $CWD/slack-desc/xorg-server-xwayland > ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install/slack-desc
-cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
-/sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+if [ -r $PKG/usr/bin/Xwayland ]; then
+ rm -r ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
+ mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
+ mv $PKG/usr/bin/Xwayland ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/bin
+ # No man page yet...
+ #mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
+ #mv $PKG/usr/man/man1/Xwayland.1.gz ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/usr/man/man1
+ mkdir -p ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install
+ cat $CWD/slack-desc/xorg-server-xwayland > ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland/install/slack-desc
+ cd ${SLACK_X_BUILD_DIR}/package-xorg-server-xwayland
+ /sbin/makepkg -l y -c n ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+fi
# Build the main xorg-server package:
cd $PKG
@@ -48,13 +50,16 @@ if [ "$UPGRADE_PACKAGES" = "yes" ]; then
/sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
/sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
/sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
- /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+ if [ -r ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz ]; then
+ /sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+ fi
/sbin/upgradepkg --install-new ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
elif [ "$UPGRADE_PACKAGES" = "always" ]; then
/sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xnest-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
/sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xvfb-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
/sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xephyr-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
- /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+ if [ -r ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz ]; then
+ /sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-xwayland-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
+ fi
/sbin/upgradepkg --install-new --reinstall ${SLACK_X_BUILD_DIR}/xorg-server-${MODULAR_PACKAGE_VERSION}-$ARCH-$BUILD.txz
fi
-
diff --git a/source/x/xorg-server-xwayland/slack-desc b/source/x/xorg-server-xwayland/slack-desc
new file mode 100644
index 000000000..7a292b27a
--- /dev/null
+++ b/source/x/xorg-server-xwayland/slack-desc
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+xorg-server-xwayland: xorg-server-xwayland (X Clients under Wayland)
+xorg-server-xwayland:
+xorg-server-xwayland: Wayland is a complete window system in itself, but even so, if we're
+xorg-server-xwayland: migrating away from X, it makes sense to have a good backwards
+xorg-server-xwayland: compatibility story. With a few changes, the Xorg server can be
+xorg-server-xwayland: modified to use Wayland input devices for input and forward either the
+xorg-server-xwayland: root window or individual top-level windows as wayland surfaces. The
+xorg-server-xwayland: server still runs the same 2D driver with the same acceleration code
+xorg-server-xwayland: as it does when it runs natively. The main difference is that Wayland
+xorg-server-xwayland: handles presentation of the windows instead of KMS.
+xorg-server-xwayland:
diff --git a/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
new file mode 100755
index 000000000..11c7061ff
--- /dev/null
+++ b/source/x/xorg-server-xwayland/xorg-server-xwayland.SlackBuild
@@ -0,0 +1,157 @@
+#!/bin/bash
+
+# Copyright 2016, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+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:-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"
+
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+ case "$( uname -m )" in
+ i?86) export ARCH=i586 ;;
+ arm*) export ARCH=arm ;;
+ # Unless $ARCH is already set, use uname -m for all other archs:
+ *) export ARCH=$( uname -m ) ;;
+ esac
+fi
+
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+ SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+ SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
+else
+ SLKCFLAGS="-O2"
+ LIBDIRSUFFIX=""
+fi
+
+TMP=${TMP:-/tmp}
+PKG=$TMP/package-$PKGNAM
+
+rm -rf $PKG
+mkdir -p $TMP $PKG
+cd $TMP || exit 1
+rm -rf $SRCNAM-$VERSION
+tar xvf $CWD/$SRCNAM-$VERSION.tar.?z || exit 1
+cd $SRCNAM-$VERSION || exit 1
+chown -R root:root .
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \+ -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \+
+
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
+ --prefix=/usr \
+ --libdir=lib${LIBDIRSUFFIX} \
+ --libexecdir=/usr/libexec \
+ --bindir=/usr/bin \
+ --sbindir=/usr/sbin \
+ --includedir=/usr/include \
+ --datadir=/usr/share \
+ --mandir=/usr/man \
+ --sysconfdir=/etc \
+ --localstatedir=/var \
+ --buildtype=release \
+ -Dxwayland_eglstream=true \
+ -Ddefault_font_path="${DEF_FONTPATH}" \
+ -Dbuilder_string="Build ID: $PKGNAM $VERSION-$BUILD" \
+ -Dxkb_output_dir=/var/lib/xkb \
+ -Dvendor_name="Slackware Linux Project" \
+ -Dxdmcp=false \
+ -Dxcsecurity=true \
+ -Dglamor=true \
+ -Ddri3=true \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
+
+# Remove unwanted files/dirs:
+rm $PKG/usr/man/man1/Xserver.1*
+rm -Rf $PKG/usr/lib${LIBDIRSUFFIX}/xorg
+rm -Rf $PKG/usr/include/xorg
+rm -Rf $PKG/usr/share/aclocal
+rm -Rf $PKG/var/lib/xkb
+
+# Strip the binaries:
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
+
+# Compress and link manpages, if any:
+if [ -d $PKG/usr/man ]; then
+ ( cd $PKG/usr/man
+ for manpagedir in $(find . -type d -name "man*") ; do
+ ( cd $manpagedir
+ for eachpage in $( find . -type l -maxdepth 1) ; do
+ ln -s $( readlink $eachpage ).gz $eachpage.gz
+ rm $eachpage
+ done
+ gzip -9 *.?
+ )
+ done
+ )
+fi
+
+mkdir -p $PKG/usr/doc/$PKGNAM-$VERSION
+cp -a \
+ AUTHORS COPYING* CREDITS INSTALL NEWS README* \
+ $PKG/usr/doc/$PKGNAM-$VERSION
+
+# If there's a ChangeLog, installing at least part of the recent history
+# is useful, but don't let it get totally out of control:
+if [ -r ChangeLog ]; then
+ DOCSDIR=$(echo $PKG/usr/doc/${PKGNAM}-$VERSION)
+ cat ChangeLog | head -n 1000 > $DOCSDIR/ChangeLog
+ touch -r ChangeLog $DOCSDIR/ChangeLog
+fi
+
+mkdir -p $PKG/install
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
diff --git a/source/xap/MPlayer/MPlayer.SlackBuild b/source/xap/MPlayer/MPlayer.SlackBuild
index 45b46d105..7becb7598 100755
--- a/source/xap/MPlayer/MPlayer.SlackBuild
+++ b/source/xap/MPlayer/MPlayer.SlackBuild
@@ -25,11 +25,11 @@
# Set initial variables:
PKGNAM=MPlayer
-VERSION=${VERSION:-20200103}
+VERSION=${VERSION:-20210418}
# Need to build trunk until there's a stable branch compatible with the
# latest ffmpeg stable release:
#BRANCH=${BRANCH:-1.3} # leave empty if you want to build MPlayer trunk
-BUILD=${BUILD:-4}
+BUILD=${BUILD:-1}
TAG=${TAG:-}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
diff --git a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
index 41d273f59..cc365e999 100755
--- a/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
+++ b/source/xap/mozilla-firefox/mozilla-firefox.SlackBuild
@@ -28,7 +28,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=mozilla-firefox
VERSION=$(basename $(ls firefox-*.tar.?z | cut -d - -f 2 | rev | cut -f 3- -d . | rev) .source)
RELEASEVER=$(echo $VERSION | cut -f 1 -d r | cut -f 1 -d b | cut -f 1 -d e)
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-1}
# Specify this variable for a localized build.
# For example, to build a version of Firefox with Italian support, run