From 97f59fb2063dae01c72e1e3a690edf5dfe645571 Mon Sep 17 00:00:00 2001 From: zangrc Date: Fri, 9 Apr 2021 01:10:59 +0800 Subject: 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 Signed-off-by: Khem Raj --- .../0001-Add-configure-time-check-for-setsid.patch | 10 ++--- meta-oe/recipes-graphics/xorg-app/xterm_366.bb | 48 ---------------------- meta-oe/recipes-graphics/xorg-app/xterm_367.bb | 48 ++++++++++++++++++++++ 3 files changed, 53 insertions(+), 53 deletions(-) delete mode 100644 meta-oe/recipes-graphics/xorg-app/xterm_366.bb create mode 100644 meta-oe/recipes-graphics/xorg-app/xterm_367.bb (limited to 'meta-oe/recipes-graphics') 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_366.bb deleted file mode 100644 index 969159bc57..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/xterm_366.bb +++ /dev/null @@ -1,48 +0,0 @@ -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" - -SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ - " - -SRC_URI[sha256sum] = "858b2885963fe97e712739066aadc1baeba2b33a0016303a7fec7d38bc73bf6e" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" - -# Let xterm install .desktop files -inherit mime-xdg - -EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ - --x-libraries=${STAGING_LIBDIR} \ - FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ - --disable-imake \ - --disable-rpath-hack \ - --disable-setuid \ - --with-app-defaults=${datadir}/X11/app-defaults \ - " - -B = "${S}" - -do_configure() { - gnu-configize --force - sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure - oe_runconf -} - -do_install_append() { - oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" -} - -RPROVIDES_${PN} = "virtual/x-terminal-emulator" - -# busybox can supply resize too -inherit update-alternatives - -ALTERNATIVE_${PN} = "resize x-terminal-emulator" -ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" -# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. -ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_367.bb b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb new file mode 100644 index 0000000000..e0d3dcec13 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-app/xterm_367.bb @@ -0,0 +1,48 @@ +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=987de9787175385203a1ea2482246a17" + +SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ + file://0001-Add-configure-time-check-for-setsid.patch \ + " + +SRC_URI[sha256sum] = "27f1a8b1c756e269fd5684e60802b545f0be9b36b8b5d6bdbc840c6b000dc51f" + +PACKAGECONFIG ?= "" +PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" + +# Let xterm install .desktop files +inherit mime-xdg + +EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ + --x-libraries=${STAGING_LIBDIR} \ + FREETYPE_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \ + --disable-imake \ + --disable-rpath-hack \ + --disable-setuid \ + --with-app-defaults=${datadir}/X11/app-defaults \ + " + +B = "${S}" + +do_configure() { + gnu-configize --force + sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure + oe_runconf +} + +do_install_append() { + oe_runmake install-desktop DESTDIR="${D}" DESKTOP_FLAGS="--dir=${D}${DESKTOPDIR}" +} + +RPROVIDES_${PN} = "virtual/x-terminal-emulator" + +# busybox can supply resize too +inherit update-alternatives + +ALTERNATIVE_${PN} = "resize x-terminal-emulator" +ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" +# rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. +ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" -- cgit 1.2.3-korg