summaryrefslogtreecommitdiffstats
path: root/source/x
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-01-16 07:23:29 +0000
committer Eric Hameleers <alien@slackware.com>2022-01-16 17:59:57 +0100
commit5ed13142b06050c1f45617acc956aadadcbe4359 (patch)
tree09adc5f83f527843ccfb771b43e082a520be0ef7 /source/x
parentd4f4bf11e34db496e8f46f7b4f67b886ce852495 (diff)
downloadcurrent-5ed13142b06050c1f45617acc956aadadcbe4359.tar.gz
current-5ed13142b06050c1f45617acc956aadadcbe4359.tar.xz
Sun Jan 16 07:23:29 UTC 202220220116072329
a/aaa_base-15.0-x86_64-3.txz: Rebuilt. In initial email to root, use the new /var/lib/pkgtools/ paths to the files for packages and scripts. Thanks to franzen. a/btrfs-progs-5.16-x86_64-1.txz: Upgraded. d/python3-3.9.10-x86_64-1.txz: Upgraded. d/rust-1.58.0-x86_64-1.txz: Upgraded. kde/digikam-7.5.0-x86_64-1.txz: Upgraded. kde/kglobalaccel-5.90.0-x86_64-2.txz: Rebuilt. Applied patch: [PATCH] Prevent kglobalaccel5 getting activated on non-Plasma systems. Although this patch was later reverted, I'm on board with the need for it. If it causes any problems, please let me know soon. Thanks to Lockywolf. kde/kid3-3.9.1-x86_64-1.txz: Upgraded. kde/plasma-wayland-protocols-1.6.0-x86_64-1.txz: Upgraded. kde/sddm-0.19.0-x86_64-10.txz: Rebuilt. Allow the init program to properly supervise sddm when entering runlevel 4. Thanks to mumahendras3. l/neon-0.32.2-x86_64-1.txz: Upgraded. l/netpbm-10.97.02-x86_64-1.txz: Upgraded. n/postfix-3.6.4-x86_64-1.txz: Upgraded. x/mesa-21.3.4-x86_64-1.txz: Upgraded. x/xterm-370-x86_64-2.txz: Rebuilt. Use upstream app-defaults again. Thanks to OldHolborn.
Diffstat (limited to 'source/x')
-rwxr-xr-xsource/x/xterm/xterm.SlackBuild17
1 files changed, 10 insertions, 7 deletions
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 53ec177ac..47d15fb31 100755
--- a/source/x/xterm/xterm.SlackBuild
+++ b/source/x/xterm/xterm.SlackBuild
@@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd)
PKGNAM=xterm
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) "}
@@ -111,12 +111,15 @@ make install DESTDIR=$PKG || exit 1
mkdir -p $PKG/usr/share/applications
cp xterm.desktop uxterm.desktop $PKG/usr/share/applications
-# Install a default XTerm app-defaults that looks like the Linux console.
-# Thanks to GazL.
-cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
-echo >> $PKG/etc/X11/app-defaults/XTerm
-cat $CWD/linux-console-xterm.ad >> $PKG/etc/X11/app-defaults/XTerm
-touch -r $PKG/etc/X11/app-defaults/XTerm.upstream.default $PKG/etc/X11/app-defaults/XTerm
+# Commented out. For now we will use upstream defaults.
+## Install a default XTerm app-defaults that looks like the Linux console.
+## Thanks to GazL.
+#cp -a $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
+#echo >> $PKG/etc/X11/app-defaults/XTerm
+#cat $CWD/linux-console-xterm.ad >> $PKG/etc/X11/app-defaults/XTerm
+#touch -r $PKG/etc/X11/app-defaults/XTerm.upstream.default $PKG/etc/X11/app-defaults/XTerm
+
+# Install app-defaults as .new:
mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new
# Strip binaries: