summaryrefslogtreecommitdiff
path: root/source/x/xterm
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-01-01 21:17:24 +0000
committerEric Hameleers <alien@slackware.com>2019-01-02 08:59:45 +0100
commiteec4d4261607e9d68560089406d11eec060421e9 (patch)
tree67cb43ddbbbb125719499d1d0f0d3c10f14d1719 /source/x/xterm
parent9b2263c35d22d77dc913ca980014efc8390305db (diff)
downloadcurrent-eec4d4261607e9d68560089406d11eec060421e9.tar.gz
Tue Jan 1 21:17:24 UTC 201920190101211724
a/coreutils-8.30-x86_64-4.txz: Rebuilt. Added xterm-new to DIR_COLORS. a/ed-1.15-x86_64-1.txz: Upgraded. a/smartmontools-7.0-x86_64-1.txz: Upgraded. a/sysvinit-2.93-x86_64-1.txz: Upgraded. ap/diffutils-3.7-x86_64-1.txz: Upgraded. ap/mc-4.8.22-x86_64-1.txz: Upgraded. l/gexiv2-0.10.10-x86_64-1.txz: Upgraded. l/libgphoto2-2.5.22-x86_64-1.txz: Upgraded. l/libwpd-0.10.3-x86_64-1.txz: Upgraded. x/xterm-341-x86_64-3.txz: Rebuilt. Append new app-defaults for XTerm rather than replacing the upstream file. Use 'xterm' rather than 'xterm-new' for termName to avoid surprises, but leave the other choice commented out. Install XTerm as XTerm.new to avoid wiping out a locally modified file. Still not sure we'll be able to stick with this as a default due to Terminus possibly not being available on a remote X server. Sure looks nice though. Thanks to GazL.
Diffstat (limited to 'source/x/xterm')
-rw-r--r--source/x/xterm/doinst.sh14
-rw-r--r--source/x/xterm/linux-console-xterm.ad8
-rwxr-xr-xsource/x/xterm/xterm.SlackBuild11
3 files changed, 26 insertions, 7 deletions
diff --git a/source/x/xterm/doinst.sh b/source/x/xterm/doinst.sh
index 1f8ff67d..7f08ab7d 100644
--- a/source/x/xterm/doinst.sh
+++ b/source/x/xterm/doinst.sh
@@ -1,3 +1,17 @@
+#!/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/X11/app-defaults/XTerm.new
+
if [ -x /usr/bin/update-desktop-database ]; then
/usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
fi
diff --git a/source/x/xterm/linux-console-xterm.ad b/source/x/xterm/linux-console-xterm.ad
index 3f43b91d..8b1eddad 100644
--- a/source/x/xterm/linux-console-xterm.ad
+++ b/source/x/xterm/linux-console-xterm.ad
@@ -4,8 +4,12 @@
!
!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-XTerm.termName: xterm-new
-! Use the more featureful 'xterm-new' terminfo entry.
+! Choose one below:
+!XTerm.termName: xterm-new
+!! Use the more featureful 'xterm-new' terminfo entry.
+XTerm.termName: xterm
+! Use the standard 'xterm' terminfo entry.
+
XTerm.locale: true
! Enable conversion between the locale and utf-8 if necessary.
!XTerm.ptyInitialErase: false
diff --git a/source/x/xterm/xterm.SlackBuild b/source/x/xterm/xterm.SlackBuild
index 75eb0642..fcc52f60 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:-2}
+BUILD=${BUILD:-3}
NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
@@ -113,10 +113,11 @@ cp xterm.desktop uxterm.desktop $PKG/usr/share/applications
# Install a default XTerm app-defaults that looks like the Linux console.
# Thanks to GazL.
-mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.upstream.default
-cp -a $CWD/linux-console-xterm.ad $PKG/etc/X11/app-defaults/XTerm
-chown root:root $PKG/etc/X11/app-defaults/XTerm
-chmod 644 $PKG/etc/X11/app-defaults/XTerm
+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
+mv $PKG/etc/X11/app-defaults/XTerm $PKG/etc/X11/app-defaults/XTerm.new
# Strip binaries:
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \