screen: uprev to 5.0.0
PATCH v2 1/1 screen: uprev to 5.0.0
License-Update: A typo "httpss->https" fixed in Copyright.
Drop deprecated patches.
Inherit autotools-brokensep instead of autotools, there are some generated headers in ${B} that referring to ${S}.
Signed-off-by Ming Liu <[email protected]>
---
...0001-Remove-more-compatibility-stuff.patch | 31 ----------
.../screen/0001-fix-for-multijob-build.patch | 58 -------------------
.../0002-comm.h-now-depends-on-term.h.patch | 30 ----------
.../{screen_4.9.1.bb => screen_5.0.0.bb} | 11 ++--
4 files changed, 4 insertions(+), 126 deletions(-)
delete mode 100644 meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch
delete mode 100644 meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch
delete mode 100644 meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch
rename meta/recipes-extended/screen/{screen_4.9.1.bb => screen_5.0.0.bb} (79%)meta/recipes-extended/screen/screen/0001-Remove-more-compatibility-stuff.patch deleted +0 -31
@@ -1,31 +0,0 @@ -This fixes -../screen-4.6.2/pty.c: In function 'OpenPTY': -../screen-4.6.2/pty.c:328:7: warning: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] - if (openpty(&f, &s, TtyName, NULL, NULL) != 0) - ^~~~~~~ - -Signed-off-by: Amadeusz Sławiński <[email protected]> -Signed-off-by: Adrian Bunk <[email protected]> -Upstream-Status: Backport - ---- - pty.c | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/pty.c b/pty.c -index 1c0660e..502338f 100644 ---- a/pty.c -+++ b/pty.c -@@ -47,11 +47,7 @@ - # include <sys/ttold.h> - #endif - --#ifdef ISC --# include <sys/tty.h> --# include <sys/sioctl.h> --# include <sys/pty.h> --#endif -+#include <pty.h> - - #ifdef sgi - # include <sys/sysmacros.h>
meta/recipes-extended/screen/screen/0001-fix-for-multijob-build.patch deleted +0 -58
58 lines not on this page · raw message
meta/recipes-extended/screen/screen/0002-comm.h-now-depends-on-term.h.patch deleted +0 -30
@@ -1,30 +0,0 @@ -Upstream-Status: Backport - -Backport from: - -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c - -Signed-off-by: Kai Kang <[email protected]> ---- -From 39c5f1c76f1fcef4b5958bf828a63f53426b6984 Mon Sep 17 00:00:00 2001 -From: Mike Gerwitz <[email protected]> -Date: Tue, 24 Dec 2013 22:16:31 -0500 -Subject: [PATCH] comm.h now depends on term.h - ---- - src/Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: screen-4.6.1/Makefile.in -=================================================================== ---- screen-4.6.1.orig/Makefile.in -+++ screen-4.6.1/Makefile.in -@@ -133,7 +133,7 @@ kmapdef.c: term.h - tty.c: tty.sh - sh $(srcdir)/tty.sh tty.c - --comm.h: comm.c comm.sh config.h -+comm.h: comm.c comm.sh config.h term.h - AWK=$(AWK) CC="$(CC) $(CFLAGS)" srcdir=${srcdir} sh $(srcdir)/comm.sh - - osdef.h: osdef.sh config.h osdef.h.in
meta/recipes-extended/screen/screen_5.0.0.bb renamed from meta/recipes-extended/screen/screen_4.9.1.bb +4 -7
@@ -8,7 +8,7 @@ BUGTRACKER = "https://savannah.gnu.org/bugs/?func=additem&group=screen" SECTION = "console/utils" LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ +LIC_FILES_CHKSUM = "file://COPYING;md5=c678957b0c8e964aa6c70fd77641a71e \ file://screen.h;endline=26;md5=b8dc717c9a3dba842ae6c44ca0f73f52 \ "
@@ -18,19 +18,16 @@ RDEPENDS:${PN} = "base-files" SRC_URI = "${GNU_MIRROR}/screen/screen-${PV}.tar.gz \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'file://screen.pam', '', d)} \ - file://0002-comm.h-now-depends-on-term.h.patch \ - file://0001-fix-for-multijob-build.patch \ - file://0001-Remove-more-compatibility-stuff.patch \ " -SRC_URI[sha256sum] = "26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69" +SRC_URI[sha256sum] = "f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971" -inherit autotools texinfo +inherit autotools-brokensep texinfo PACKAGECONFIG ??= "" PACKAGECONFIG[utempter] = "ac_cv_header_utempter_h=yes,ac_cv_header_utempter_h=no,libutempter," -EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-sys-screenrc=${sysconfdir}/screenrc \ +EXTRA_OECONF = "--with-pty-mode=0620 --with-pty-group=5 --with-system_screenrc=${sysconfdir}/screenrc \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', '--enable-pam', '--disable-pam', d)}" do_install:append () {
Signature · 1 line
2.43.0