Skip to content

Commit cffd561

Browse files
authored
Upgrade: xterm version to 395 (#11892)
1 parent 8fad286 commit cffd561

8 files changed

Lines changed: 320 additions & 115 deletions
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
-----BEGIN PGP PUBLIC KEY BLOCK-----
2+
3+
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
40+
P46cd3aSov0rfNS/zg==
41+
=cr15
42+
-----END PGP PUBLIC KEY BLOCK-----
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
-----BEGIN PGP SIGNATURE-----
2+
Comment: See https://invisible-island.net/public/public.html for info
3+
4+
iQGzBAABCgAdFiEEGYgtkt2kxADCLA1WzCr0RyFnvgMFAmca72MACgkQzCr0RyFn
5+
vgN2agwA9iAfTrQrXeXl8sbzBrD3Cd7hRHrlncX24cJve7lG8fSUoqpKSWEYcBub
6+
37tcTLwnN6zCTJwJbwrcYdU5JMGlZMFg+lwPFVpHh7dc3Zf4vDW+ws6FMAU4nxAV
7+
45LwQG3fUWe96ffZDvJIiinqTkYq+0YqmdjTHDHVXt4393Sa7XrV4jRkj4QdXWDK
8+
XAsbp8HGdcDD+j+MuGHC8d4xN4Zg/L5taZxgYBuPhj0a16SKjT9XE/PccCLdTpy5
9+
wjXnjdUagAtqStscW0o1v3J7PO8DihYzeAFoZ+Ha9eQsz0SLT2wRWLoibdRFhDAz
10+
micvRIOAt/gJO66pC+IUxt2Szv1QESbHXBp3aYr1I8jRHFnix5ZpJqDm5wGMVVPY
11+
vZucOWMOzQCGfhZz2Ji8TjmsFFq8MJLOFhCEE8KVHa0P3Ua92GtWZtCOPnUQa8Sx
12+
SejKMwNCSQIT7uTpTKa0A7OcwIV4xocR1u/QgRIL+pLjljIyBd/pBLsuhFo0bgw8
13+
JLkLih21
14+
=gqKZ
15+
-----END PGP SIGNATURE-----
Lines changed: 4 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,7 @@
1-
From 6696712fa7336550c8740be3d8947c993cea16e0 Mon Sep 17 00:00:00 2001
2-
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
3-
Date: Fri, 12 Aug 2022 07:27:06 +0530
4-
Subject: [PATCH 1/3] xterm defaults
5-
6-
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
7-
---
8-
XTerm.ad | 8 ++++++++
9-
1 file changed, 8 insertions(+)
10-
11-
diff --git a/XTerm.ad b/XTerm.ad
12-
index 6d347a1..e4b1828 100644
13-
--- a/XTerm.ad
14-
+++ b/XTerm.ad
15-
@@ -270,3 +270,11 @@
1+
diff -up xterm-333/XTerm.ad.defaults xterm-333/XTerm.ad
2+
--- xterm-333/XTerm.ad.defaults 2016-12-22 03:07:39.000000000 +0100
3+
+++ xterm-333/XTerm.ad 2018-05-30 15:44:53.325426803 +0200
4+
@@ -259,3 +259,11 @@
165
!*allowTcapOps: false
176
!*allowTitleOps: false
187
!*allowWindowOps: false
@@ -24,6 +13,3 @@ index 6d347a1..e4b1828 100644
2413
+*VT100*scrollBar: true
2514
+*VT100*utf8Title: true
2615
+*termName: xterm-256color
27-
--
28-
2.40.1
29-
Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
From bcec1be9a45ae1c319c2bca9d5093c05db6be717 Mon Sep 17 00:00:00 2001
2-
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
3-
Date: Fri, 12 Aug 2022 07:29:12 +0530
4-
Subject: [PATCH 2/3] xterm desktop
5-
6-
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
7-
---
8-
xterm.desktop | 4 ++--
9-
1 file changed, 2 insertions(+), 2 deletions(-)
10-
111
diff --git a/xterm.desktop b/xterm.desktop
122
index b6b27d0..e9a2c6c 100644
133
--- a/xterm.desktop
@@ -28,6 +18,3 @@ index b6b27d0..e9a2c6c 100644
2818
Categories=System;TerminalEmulator;
2919
Keywords=shell;prompt;command;commandline;cmd;
3020
StartupWMClass=XTerm
31-
--
32-
2.40.1
33-
Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,8 @@
1-
From 43040291be2f48d6b2aae015592266c0b1dbd59e Mon Sep 17 00:00:00 2001
2-
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
3-
Date: Fri, 12 Aug 2022 07:34:42 +0530
4-
Subject: [PATCH 3/3] xterm man paths
5-
6-
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
7-
---
8-
minstall.in | 8 ++++++++
9-
xterm.man | 7 +++----
10-
2 files changed, 11 insertions(+), 4 deletions(-)
11-
121
diff --git a/minstall.in b/minstall.in
13-
index fe2c610..03b00b3 100644
2+
index ec3c936..e4f2911 100644
143
--- a/minstall.in
154
+++ b/minstall.in
16-
@@ -141,6 +141,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'`
5+
@@ -109,6 +109,11 @@ USE_chr1=`echo "$USE_name" | sed -e 's/^.//'`
176
USE_Name=${USE_chr0}${USE_chr1}
187
USE_NAME=`echo "$USE_name" | tr "$lower" "$upper"`
198

@@ -25,21 +14,21 @@ index fe2c610..03b00b3 100644
2514
sed -e 's%__vendorversion__%"X Window System"%' \
2615
-e 's%__app_version__%Patch\ \#'"$PATCH_NUM"% \
2716
-e 's%__app_date__%'"$PATCH_YMD"% \
28-
@@ -166,6 +171,9 @@ sed -e 's%__vendorversion__%"X Window System"%' \
29-
-e "s%/etc/utmp%$UTMP_PATH%g" \
30-
-e 's%fIwtmp\\%fI'$WTMP_NAME'\\%g' \
31-
-e "s%/etc/wtmp%$WTMP_PATH%g" \
17+
@@ -135,6 +140,9 @@ sed -e 's%__vendorversion__%"X Window System"%' \
18+
-e "s%__wtmp_name__%@WTMP_NAME@%g" \
19+
-e "s%__wtmp_path__%@WTMP_PATH@%g" \
20+
-e 's%/\\(\*\*%/*%g' \
3221
+ -e s%__fontpath__%$fontpath%g \
3322
+ -e s%__xorgcfgdir__%$xorgcfgdir%g \
3423
+ -e s%__xorgcfgfil__%$xorgcfgfil%g \
35-
-e 's%/\\(\*\*%/*%g' \
3624
"$OLD_FILE" >$NEW_FILE
3725
# diff -u $OLD_FILE $NEW_FILE
26+
3827
diff --git a/xterm.man b/xterm.man
39-
index f8270fd..51867fa 100644
28+
index 1792099..9b63f79 100644
4029
--- a/xterm.man
4130
+++ b/xterm.man
42-
@@ -2572,19 +2572,18 @@ Since X11R6, bitmap fonts have been scaled.
31+
@@ -2580,19 +2580,18 @@ Since X11R6, bitmap fonts have been scaled.
4332
The font server claims to provide the bold font that \fI\*n\fP requests,
4433
but the result is not always readable.
4534
XFree86 introduced a feature which can be used to suppress the scaling.
@@ -62,6 +51,3 @@ index f8270fd..51867fa 100644
6251
.NE
6352
.IP
6453
Depending on your configuration, the font server may have its own configuration
65-
--
66-
2.40.1
67-
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
{
22
"Signatures": {
33
"16colors.txt": "a2342029672532256110ef28a0ea1addb7f6fd1f08aacc382d0fbe2308f178c2",
4-
"xterm-380.tar.gz": "a46c2799ee2897006f3a01cd80416cca7a3942503a8975f51a281a9f5627da21"
4+
"dickey@invisible-island.net-rsa3072.asc": "59ac84797cd902c55f22d550155fa9e02f7e0c923ad64d6d81b2c88668e265bb",
5+
"xterm-395.tgz": "286e3caa5938eae38e202827621567629dfeaae689e8070b413ca11398093dc8",
6+
"xterm-395.tgz.asc": "021949ae527c2a4286dcd5021017caf39cfe049242f08287fa4d6b885db6f1be"
57
}
6-
}
8+
}

0 commit comments

Comments
 (0)