aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzangrc <zangrc.fnst@fujitsu.com>2021-04-09 01:10:59 +0800
committerKhem Raj <raj.khem@gmail.com>2021-04-08 09:25:54 -0700
commit97f59fb2063dae01c72e1e3a690edf5dfe645571 (patch)
tree76810afd33f32c25cf80b16c63b92a6cfeb813b9
parente1185b272a48e8b797bc7c4e96645cc2fce3d298 (diff)
downloadmeta-openembedded-contrib-97f59fb2063dae01c72e1e3a690edf5dfe645571.tar.gz
meta-openembedded-contrib-97f59fb2063dae01c72e1e3a690edf5dfe645571.tar.bz2
meta-openembedded-contrib-97f59fb2063dae01c72e1e3a690edf5dfe645571.zip
xterm: upgrade 366 -> 367
-License-Update: Copyright year updated to 2021. Refresh the following patch: 0001-Add-configure-time-check-for-setsid.patch Signed-off-by: Zang Ruochen <zangrc.fnst@fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r--meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch10
-rw-r--r--meta-oe/recipes-graphics/xorg-app/xterm_367.bb (renamed from meta-oe/recipes-graphics/xorg-app/xterm_366.bb)4
2 files changed, 7 insertions, 7 deletions
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 d3beea8be1..92ecdac224 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
@@ -18,7 +18,7 @@ diff --git a/configure b/configure
index 0aafefc..03e8df0 100755
--- a/configure
+++ b/configure
-@@ -5411,6 +5411,7 @@ for ac_func in \
+@@ -5605,6 +5605,7 @@ for ac_func in \
unsetenv \
sched_yield \
setpgid \
@@ -42,7 +42,7 @@ diff --git a/main.c b/main.c
index 5e60589..b81d2be 100644
--- a/main.c
+++ b/main.c
-@@ -2868,7 +2868,7 @@ main(int argc, char *argv[]ENVP_ARG)
+@@ -2903,7 +2903,7 @@ main(int argc, char *argv[]ENVP_ARG)
}
}
@@ -51,7 +51,7 @@ index 5e60589..b81d2be 100644
#define USE_OPENPTY 1
static int opened_tty = -1;
#endif
-@@ -4040,7 +4040,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
+@@ -4074,7 +4074,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
/*
* now in child process
*/
@@ -64,14 +64,14 @@ diff --git a/xtermcfg.hin b/xtermcfg.hin
index 1dbc3b8..4f3ff5b 100644
--- a/xtermcfg.hin
+++ b/xtermcfg.hin
-@@ -96,6 +96,7 @@
+@@ -95,6 +95,7 @@
#undef HAVE_PUTENV /* AC_CHECK_FUNCS(putenv) */
#undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */
#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_STRFTIME /* AC_CHECK_FUNCS(strftime) */
+ #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */
--
2.24.1
diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb
index 969159bc57..e0d3dcec13 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb
@@ -2,13 +2,13 @@ require recipes-graphics/xorg-app/xorg-app-common.inc
SUMMARY = "xterm is the standard terminal emulator for the X Window System"
DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native"
-LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=996b1ce0584c0747b17b57654cc81e8e"
+LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=987de9787175385203a1ea2482246a17"
SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \
file://0001-Add-configure-time-check-for-setsid.patch \
"
-SRC_URI[sha256sum] = "858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e"
+SRC_URI[sha256sum] = "27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f"
PACKAGECONFIG ?= ""
PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native"