[meta-oe] [PATCH] xterm: upgrade 378 -> 379


wangmy
 

From: Wang Mingyu <wangmy@...>

Changelog:
==========
* improve text-cursor (patch by Jan Engelhardt):
+ allow selecting CURSOR_BAR mode from command-line/Xresources.
+ draw cursor using filled rectangle instead of rectangle
outline to permit thicker underlines/bars.
+ scale up cursor relative to font size.
* improve readline modes (Fedora #2166860):
+ document readline modes
+ change the feature to configure by default
+ replace hard-coded SS3 for cursor movement with current mode
+ replace hard-coded erase/lnext characters with current values
* improve status-line (report by Thomas Wolff):
+ RIS turns off status-line
+ Right-margin (DECLRMM and DECSLRM) limits the length of text
written/updated in the status-line.
+ Most controls which affect the whole screen are ignored while
updating the status-line.
* modify configure check for tgetent to allow for some special cases
of ncurses configuration (report by Satadru Pramani).
* reduce timeout, improve warning message if resize is run on a
terminal which is not VT100-compatible.
* reduce compiler warnings in configure script.

0001-Add-configure-time-check-for-setsid.patch
refreshed for new version.

Signed-off-by: Wang Mingyu <wangmy@...>
---
...-Add-configure-time-check-for-setsid.patch | 26 +++++++++----------
.../xorg-app/{xterm_378.bb => xterm_379.bb} | 2 +-
2 files changed, 13 insertions(+), 15 deletions(-)
rename meta-oe/recipes-graphics/xorg-app/{xterm_378.bb => xterm_379.bb} (94%)

diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
index 92ecdac22..a6cf16e4e 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
+++ b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch
@@ -1,4 +1,4 @@
-From 3730a38efad969fb6f8227df07eb4461a078f5a3 Mon Sep 17 00:00:00 2001
+From b23d38f1216c4d70738edaa367cf9ecd2dd4b660 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@...>
Date: Fri, 13 Dec 2019 12:59:26 -0800
Subject: [PATCH] Add configure time check for setsid
@@ -7,18 +7,19 @@ Do not assume glibc == linux

Upstream-Status: Pending
Signed-off-by: Khem Raj <raj.khem@...>
+
---
configure | 1 +
configure.in | 1 +
main.c | 4 ++--
xtermcfg.hin | 1 +
- 5 files changed, 6 insertions(+), 2 deletions(-)
+ 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/configure b/configure
-index 0aafefc..03e8df0 100755
+index 72342c7..c2ec2ac 100755
--- a/configure
+++ b/configure
-@@ -5605,6 +5605,7 @@ for ac_func in \
+@@ -5803,6 +5803,7 @@ for ac_func in \
unsetenv \
sched_yield \
setpgid \
@@ -27,7 +28,7 @@ index 0aafefc..03e8df0 100755
tcgetattr \
waitpid \
diff --git a/configure.in b/configure.in
-index d2fee88..74d65df 100644
+index 56dbc25..0608c80 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,7 @@ AC_CHECK_FUNCS( \
@@ -39,10 +40,10 @@ index d2fee88..74d65df 100644
tcgetattr \
waitpid \
diff --git a/main.c b/main.c
-index 5e60589..b81d2be 100644
+index 24da0eb..332174c 100644
--- a/main.c
+++ b/main.c
-@@ -2903,7 +2903,7 @@ main(int argc, char *argv[]ENVP_ARG)
+@@ -2956,7 +2956,7 @@ main(int argc, char *argv[]ENVP_ARG)
}
}

@@ -51,7 +52,7 @@ index 5e60589..b81d2be 100644
#define USE_OPENPTY 1
static int opened_tty = -1;
#endif
-@@ -4074,7 +4074,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
+@@ -4205,7 +4205,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
/*
* now in child process
*/
@@ -61,17 +62,14 @@ index 5e60589..b81d2be 100644
#else
int pgrp = getpid();
diff --git a/xtermcfg.hin b/xtermcfg.hin
-index 1dbc3b8..4f3ff5b 100644
+index 19048cd..e54d2cd 100644
--- a/xtermcfg.hin
+++ b/xtermcfg.hin
-@@ -95,6 +95,7 @@
- #undef HAVE_PUTENV /* AC_CHECK_FUNCS(putenv) */
+@@ -98,6 +98,7 @@
#undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */
+ #undef HAVE_SETITIMER /* CF_SETITIMER */
#undef HAVE_SETPGID /* AC_CHECK_FUNCS(setpgid) */
+#undef HAVE_SETSID /* AC_CHECK_FUNCS(setsid) */
#undef HAVE_STDINT_H /* AC_PROG_CC_STDC */
#undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */
#undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */
---
-2.24.1
-
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_378.bb b/meta-oe/recipes-graphics/xorg-app/xterm_379.bb
similarity index 94%
rename from meta-oe/recipes-graphics/xorg-app/xterm_378.bb
rename to meta-oe/recipes-graphics/xorg-app/xterm_379.bb
index c82042b21..1c32b5d5b 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_378.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_379.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
file://0001-Add-configure-time-check-for-setsid.patch \
"

-SRC_URI[sha256sum] = "649dfbfd5edd0ed9e47cf8e4d953b4b0d3c30bc280166dfc4ffd14973fec3e92"
+SRC_URI[sha256sum] = "a7ddf274ee84b97fb1283675009d53ca2d02a0ffd5ce5a5118dafc3623ebb310"

PACKAGECONFIG ?= ""
PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"
--
2.34.1