diff --git a/.checkpackageignore b/.checkpackageignore index fbebf404d6..1e921c1369 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -1145,13 +1145,10 @@ package/samba4/0001-build-find-pre-built-heimdal-build-tools-in-case-of-.patch l package/samba4/0002-ldap_message_test.c-include-stdint.h-before-cmoka.h.patch lib_patch.Upstream package/samba4/S91smb Shellcheck lib_sysv.Indent lib_sysv.Variables package/sane-backends/0001-sane_backend-add-missing-config.h.patch lib_patch.Upstream -package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch lib_patch.Upstream -package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch lib_patch.Upstream -package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch lib_patch.Upstream -package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch lib_patch.Upstream -package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch lib_patch.Upstream -package/screen/0006-comm.h-now-depends-on-term.h.patch lib_patch.Upstream -package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch lib_patch.Upstream +package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch lib_patch.Upstream +package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch lib_patch.Upstream +package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch lib_patch.Upstream +package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch lib_patch.Upstream package/scrub/0001-configure-ac-make-sure-m4-macros-are-included-in-the-build.patch lib_patch.Upstream package/sdl/0001-use-correct-directfb-config.patch lib_patch.Upstream package/sdl/0002-fix-compilation-with-libx11.patch lib_patch.Upstream diff --git a/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch b/package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch similarity index 73% rename from package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch rename to package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch index ef82cd3e76..4a8a55dcec 100644 --- a/package/screen/0002-Do-not-create-backup-of-old-installed-binary.patch +++ b/package/screen/0001-Do-not-create-backup-of-old-installed-binary.patch @@ -1,4 +1,4 @@ -From 86b5c7677c5bef780bd4c28cbbdaa97eda938230 Mon Sep 17 00:00:00 2001 +From fd002bd3ab730a0976dc000477f7dd9e162c0269 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sun, 14 Sep 2014 23:58:34 +0200 Subject: [PATCH] Do not create backup of old installed binary @@ -9,30 +9,31 @@ Signed-off-by: Maarten ter Huurne [baruch: update for 4.6.2] Signed-off-by: Baruch Siach [Julien: rebase on top of 4.9.1] +[Julien: rebase on top of 5.0.0] Signed-off-by: Julien Olivain --- - Makefile.in | 4 ---- - 1 file changed, 4 deletions(-) + Makefile.in | 5 ----- + 1 file changed, 5 deletions(-) diff --git a/Makefile.in b/Makefile.in -index 26ec404..3efbbfd 100644 +index 92f434a..860ecd7 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -83,12 +83,9 @@ screen: $(OFILES) - $(OPTIONS) $(CFLAGS) $< +@@ -77,12 +77,8 @@ tests/test-%: tests/test-%.c %.o tests/mallocmock.o tests/macros.h tests/signatu + $(CC) $(CPPFLAGS) $(CFLAGS) $< -o $@ $*.o tests/mallocmock.o - install_bin: .version screen installdirs + install_bin: screen installdirs - -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ - then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) - # This doesn't work if $(bindir)/screen is a symlink +-# This doesn't work if $(bindir)/screen is a symlink - -if [ -f $(DESTDIR)$(bindir)/screen ] && [ ! -f $(DESTDIR)$(bindir)/screen.old ]; then mv $(DESTDIR)$(bindir)/screen $(DESTDIR)$(bindir)/screen.old; fi rm -f $(DESTDIR)$(bindir)/screen (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -@@ -113,7 +110,6 @@ installdirs: - uninstall: .version +@@ -107,7 +103,6 @@ installdirs: + uninstall: rm -f $(DESTDIR)$(bindir)/$(SCREEN) rm -f $(DESTDIR)$(bindir)/screen - -mv $(DESTDIR)$(bindir)/screen.old $(DESTDIR)$(bindir)/screen @@ -40,5 +41,5 @@ index 26ec404..3efbbfd 100644 cd doc; $(MAKE) uninstall -- -2.41.0 +2.46.2 diff --git a/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch b/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch deleted file mode 100644 index ab002701d7..0000000000 --- a/package/screen/0001-Do-not-use-memcpy-as-an-alternative-for-bcopy-memmov.patch +++ /dev/null @@ -1,133 +0,0 @@ -From 545875ad0b6c9697fae41ae8770e95d117fe3cca Mon Sep 17 00:00:00 2001 -From: Maarten ter Huurne -Date: Sat, 13 Sep 2014 11:37:59 +0200 -Subject: [PATCH] Do not use memcpy as an alternative for bcopy/memmove - -The configure script runs a small test program to check whether -memcpy can handle overlapping memory areas. However, it is not valid -to conclude that if a single case of overlapping memory is handled -correctly, all cases will be handled correctly. - -Since screen already has its own bcopy implementation as a fallback -for the case that bcopy and memmove are unusable, removing the memcpy -option should not break any systems. - -Signed-off-by: Maarten ter Huurne -[Ricardo: rebase on top of 4.3.1] -Signed-off-by: Ricardo Martincoski -[Bernd: rebase on top of 4.7.0] -Signed-off-by: Bernd Kuhls -[Julien: rebase on top of 4.9.1] -Signed-off-by: Julien Olivain ---- - acconfig.h | 3 +-- - configure.ac | 22 +--------------------- - os.h | 8 ++------ - osdef.h.in | 10 +--------- - 4 files changed, 5 insertions(+), 38 deletions(-) - -diff --git a/acconfig.h b/acconfig.h -index 46d62b0..f83572c 100644 ---- a/acconfig.h -+++ b/acconfig.h -@@ -476,7 +476,7 @@ - #undef GETTTYENT - - /* -- * Define USEBCOPY if the bcopy/memcpy from your system's C library -+ * Define USEBCOPY if the bcopy from your system's C library - * supports the overlapping of source and destination blocks. When - * undefined, screen uses its own (probably slower) version of bcopy(). - * -@@ -487,7 +487,6 @@ - * Their memove fails the test in the configure script. Sigh. (Juergen) - */ - #undef USEBCOPY --#undef USEMEMCPY - #undef USEMEMMOVE - - /* -diff --git a/configure.ac b/configure.ac -index 1a12c04..6f6c2da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1278,7 +1278,7 @@ AC_TRY_LINK([ - fdwalk(NULL, NULL); - ],AC_DEFINE(HAVE_FDWALK)) - --AC_CHECKING(whether memcpy/memmove/bcopy handles overlapping arguments) -+AC_CHECKING(whether memmove/bcopy handles overlapping arguments) - AC_TRY_RUN([ - #include - #include -@@ -1319,26 +1319,6 @@ main() { - }], AC_DEFINE(USEMEMMOVE),, - AC_NOTE(- skipping check because we are cross compiling; use memmove) AC_DEFINE(USEMEMMOVE)) - --AC_TRY_RUN([ --#include --#include -- --#define bcopy(s,d,l) memcpy(d,s,l) -- --int --main() { -- char buf[10]; -- strcpy(buf, "abcdefghi"); -- bcopy(buf, buf + 2, 3); -- if (strncmp(buf, "ababcf", 6)) -- return 1; -- strcpy(buf, "abcdefghi"); -- bcopy(buf + 2, buf, 3); -- if (strncmp(buf, "cdedef", 6)) -- return 1; -- return 0; /* libc version works properly. */ --}], AC_DEFINE(USEMEMCPY),,:) -- - AC_SYS_LONG_FILE_NAMES - - AC_MSG_CHECKING(for vsprintf) -diff --git a/os.h b/os.h -index 2a1c2ca..d1ac87e 100644 ---- a/os.h -+++ b/os.h -@@ -142,12 +142,8 @@ extern int errno; - # ifdef USEMEMMOVE - # define bcopy(s,d,len) memmove(d,s,len) - # else --# ifdef USEMEMCPY --# define bcopy(s,d,len) memcpy(d,s,len) --# else --# define NEED_OWN_BCOPY --# define bcopy xbcopy --# endif -+# define NEED_OWN_BCOPY -+# define bcopy xbcopy - # endif - #endif - -diff --git a/osdef.h.in b/osdef.h.in -index 6ddbd66..abdacf7 100644 ---- a/osdef.h.in -+++ b/osdef.h.in -@@ -58,16 +58,8 @@ extern int bcmp __P((char *, char *, int)); - extern int killpg __P((int, int)); - #endif - --#ifndef USEBCOPY --# ifdef USEMEMCPY --extern void memcpy __P((char *, char *, int)); --# else --# ifdef USEMEMMOVE -+#if defined(USEMEMMOVE) && !defined(USEBCOPY) - extern void memmove __P((char *, char *, int)); --# else --extern void bcopy __P((char *, char *, int)); --# endif --# endif - #else - extern void bcopy __P((char *, char *, int)); - #endif --- -2.41.0 - diff --git a/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch b/package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch similarity index 73% rename from package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch rename to package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch index bc3f676af3..406a6dab5d 100644 --- a/package/screen/0003-Change-binary-permission-flags-even-if-chown-fails.patch +++ b/package/screen/0002-Change-binary-permission-flags-even-if-chown-fails.patch @@ -1,4 +1,4 @@ -From 4231969c47a8379f9113e0c9c9586bcfdd545c37 Mon Sep 17 00:00:00 2001 +From c348717c7f13efc2c26723670c4d520985eb41f7 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 15 Sep 2014 00:03:05 +0200 Subject: [PATCH] Change binary permission flags even if chown fails @@ -8,25 +8,26 @@ the chown will fail. But the chmod can still be done. Signed-off-by: Maarten ter Huurne [Julien: rebase on top of 4.9.1] +[Julien: rebase on top of 5.0.0] Signed-off-by: Julien Olivain --- Makefile.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile.in b/Makefile.in -index 3efbbfd..0315fde 100644 +index 860ecd7..5bb5ed8 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -84,7 +84,8 @@ screen: $(OFILES) +@@ -78,7 +78,8 @@ tests/test-%: tests/test-%.c %.o tests/mallocmock.o tests/macros.h tests/signatu - install_bin: .version screen installdirs + install_bin: screen installdirs $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) - -chown root $(DESTDIR)$(bindir)/$(SCREEN) && chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) + -chown root $(DESTDIR)$(bindir)/$(SCREEN) + -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) - # This doesn't work if $(bindir)/screen is a symlink rm -f $(DESTDIR)$(bindir)/screen (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) + cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS) -- -2.41.0 +2.46.2 diff --git a/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch b/package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch similarity index 81% rename from package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch rename to package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch index 15795874ae..14f4dd6656 100644 --- a/package/screen/0004-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch +++ b/package/screen/0003-Support-overriding-SCREEN-to-get-a-non-versioned-bin.patch @@ -1,4 +1,4 @@ -From 07d6e4d9da8bc7c6ed31aa9b643410ea093d164f Mon Sep 17 00:00:00 2001 +From 4baa4ff25a583456d781e553604a79c51a46bd53 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Mon, 15 Sep 2014 00:06:20 +0200 Subject: [PATCH] Support overriding SCREEN to get a non-versioned binary @@ -8,21 +8,21 @@ If a packager runs "make install SCREEN=screen", do not create Signed-off-by: Maarten ter Huurne [Julien: rebase on top of 4.9.1] +[Julien: rebase on top of 5.0.0] Signed-off-by: Julien Olivain --- Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.in b/Makefile.in -index 0315fde..4718f08 100644 +index 5bb5ed8..d03129e 100644 --- a/Makefile.in +++ b/Makefile.in -@@ -86,9 +86,11 @@ install_bin: .version screen installdirs +@@ -80,8 +80,10 @@ install_bin: screen installdirs $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) -chown root $(DESTDIR)$(bindir)/$(SCREEN) -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN) +ifneq (${SCREEN},screen) - # This doesn't work if $(bindir)/screen is a symlink rm -f $(DESTDIR)$(bindir)/screen (cd $(DESTDIR)$(bindir) && ln -f -s $(SCREEN) screen) +endif @@ -30,5 +30,5 @@ index 0315fde..4718f08 100644 ############################################################################### -- -2.41.0 +2.46.2 diff --git a/package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch b/package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch new file mode 100644 index 0000000000..5a7deb7d1d --- /dev/null +++ b/package/screen/0004-Renamed-sched.h-to-eventqueue.h.patch @@ -0,0 +1,251 @@ +From 50041d75d59e7343f1fd45bec5bd0c92b47e0a8e Mon Sep 17 00:00:00 2001 +From: Maarten ter Huurne +Date: Mon, 15 Sep 2014 00:24:41 +0200 +Subject: [PATCH] Renamed sched.h to eventqueue.h + +There is a system header that got shadowed by "sched.h". +While Screen itself doesn't include , other system headers +might include it indirectly. This broke the build when using uClibc +with pthread support. + +Signed-off-by: Maarten ter Huurne +[Julien: rebase on top of 4.9.1] +[Julien: rebase on top of 5.0.0, renamed all occurences of sched.h] +Signed-off-by: Julien Olivain +--- + Makefile.in | 66 ++++++++++++++++++++--------------------- + canvas.h | 2 +- + sched.h => eventqueue.h | 0 + sched.c | 2 +- + screen.h | 2 +- + window.h | 2 +- + winmsg.c | 2 +- + 7 files changed, 38 insertions(+), 38 deletions(-) + rename sched.h => eventqueue.h (100%) + +diff --git a/Makefile.in b/Makefile.in +index d03129e..69ffe60 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -165,116 +165,116 @@ depend.in: $(CFILES) term.h + ############################################################################### + + ### Dependencies: +-screen.o: screen.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++screen.o: screen.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h \ + fileio.h mark.h attacher.h encoding.h help.h misc.h process.h socket.h \ + termcap.h tty.h utmp.h +-ansi.o: ansi.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++ansi.o: ansi.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h \ + fileio.h help.h mark.h misc.h process.h resize.h +-fileio.o: fileio.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++fileio.o: fileio.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h fileio.h misc.h process.h winmsgbuf.h termcap.h encoding.h +-mark.o: mark.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++mark.o: mark.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h encoding.h fileio.h mark.h process.h winmsgbuf.h search.h +-misc.o: misc.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++misc.o: misc.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h +-resize.o: resize.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++resize.o: resize.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h process.h winmsgbuf.h resize.h telnet.h +-socket.o: socket.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++socket.o: socket.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h encoding.h fileio.h list_generic.h misc.h process.h \ + winmsgbuf.h resize.h socket.h termcap.h tty.h utmp.h +-search.o: search.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++search.o: search.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h mark.h input.h +-tty.o: tty.c config.h screen.h os.h ansi.h sched.h acls.h comm.h layer.h \ ++tty.o: tty.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h layer.h \ + term.h image.h canvas.h display.h layout.h viewport.h window.h logfile.h \ + fileio.h misc.h pty.h telnet.h tty.h + term.o: term.c term.h +-window.o: window.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++window.o: window.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h fileio.h help.h \ + input.h mark.h misc.h process.h pty.h resize.h telnet.h termcap.h tty.h \ + utmp.h +-utmp.o: utmp.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++utmp.o: utmp.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h misc.h tty.h utmp.h +-help.o: help.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++help.o: help.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h misc.h list_generic.h process.h winmsgbuf.h +-termcap.o: termcap.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++termcap.o: termcap.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h encoding.h misc.h process.h winmsgbuf.h resize.h termcap.h +-input.o: input.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++input.o: input.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h misc.h +-attacher.o: attacher.c config.h screen.h os.h ansi.h sched.h acls.h \ ++attacher.o: attacher.c config.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h misc.h socket.h tty.h +-pty.o: pty.c config.h screen.h os.h ansi.h sched.h acls.h comm.h layer.h \ ++pty.o: pty.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h layer.h \ + term.h image.h canvas.h display.h layout.h viewport.h window.h logfile.h +-process.o: process.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++process.o: process.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h \ + fileio.h help.h input.h kmapdef.h list_generic.h mark.h misc.h process.h \ + resize.h search.h socket.h telnet.h termcap.h tty.h utmp.h +-display.o: display.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++display.o: display.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h mark.h \ + misc.h process.h pty.h resize.h termcap.h tty.h +-comm.o: comm.c config.h os.h screen.h ansi.h sched.h acls.h comm.h \ ++comm.o: comm.c config.h os.h screen.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h + kmapdef.o: kmapdef.c config.h +-acls.o: acls.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++acls.o: acls.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h mark.h misc.h process.h winmsgbuf.h +-logfile.o: logfile.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++logfile.o: logfile.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h misc.h +-layer.o: layer.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++layer.o: layer.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h encoding.h mark.h tty.h +-winmsg.o: winmsg.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++winmsg.o: winmsg.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h fileio.h \ + process.h mark.h +-winmsgbuf.o: winmsgbuf.c winmsgbuf.h screen.h os.h ansi.h sched.h acls.h \ ++winmsgbuf.o: winmsgbuf.c winmsgbuf.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h + winmsgcond.o: winmsgcond.c winmsgcond.h +-backtick.o: backtick.c backtick.h screen.h os.h ansi.h sched.h acls.h \ ++backtick.o: backtick.c backtick.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h fileio.h +-sched.o: sched.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++sched.o: sched.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h + telnet.o: telnet.c config.h comm.h +-encoding.o: encoding.c config.h screen.h os.h ansi.h sched.h acls.h \ ++encoding.o: encoding.c config.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h encoding.h fileio.h +-canvas.o: canvas.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++canvas.o: canvas.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h help.h list_generic.h resize.h +-layout.o: layout.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ ++layout.o: layout.c config.h screen.h os.h ansi.h eventqueue.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h fileio.h misc.h process.h winmsgbuf.h resize.h +-viewport.o: viewport.c config.h screen.h os.h ansi.h sched.h acls.h \ ++viewport.o: viewport.c config.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h +-list_display.o: list_display.c config.h screen.h os.h ansi.h sched.h \ ++list_display.o: list_display.c config.h screen.h os.h ansi.h eventqueue.h \ + acls.h comm.h layer.h term.h image.h canvas.h display.h layout.h \ + viewport.h window.h logfile.h list_generic.h misc.h +-list_generic.o: list_generic.c config.h screen.h os.h ansi.h sched.h \ ++list_generic.o: list_generic.c config.h screen.h os.h ansi.h eventqueue.h \ + acls.h comm.h layer.h term.h image.h canvas.h display.h layout.h \ + viewport.h window.h logfile.h input.h list_generic.h misc.h +-list_window.o: list_window.c config.h screen.h os.h ansi.h sched.h acls.h \ ++list_window.o: list_window.c config.h screen.h os.h ansi.h eventqueue.h acls.h \ + comm.h layer.h term.h image.h canvas.h display.h layout.h viewport.h \ + window.h logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h input.h \ + list_generic.h misc.h process.h +diff --git a/canvas.h b/canvas.h +index 8460d9a..ec5fdaa 100644 +--- a/canvas.h ++++ b/canvas.h +@@ -31,7 +31,7 @@ + #define SCREEN_CANVAS_H + + #include "layer.h" +-#include "sched.h" ++#include "eventqueue.h" + + #define SLICE_UNKN 0 + #define SLICE_VERT (1 << 0) +diff --git a/sched.h b/eventqueue.h +similarity index 100% +rename from sched.h +rename to eventqueue.h +diff --git a/sched.c b/sched.c +index 3618f11..dc59b11 100644 +--- a/sched.c ++++ b/sched.c +@@ -28,7 +28,7 @@ + + #include "config.h" + +-#include "sched.h" ++#include "eventqueue.h" + + #include + #include +diff --git a/screen.h b/screen.h +index 308c365..e39c2b1 100644 +--- a/screen.h ++++ b/screen.h +@@ -67,7 +67,7 @@ struct mode { + #include "ansi.h" + #include "image.h" + #include "layer.h" +-#include "sched.h" ++#include "eventqueue.h" + #include "term.h" + #include "window.h" + +diff --git a/window.h b/window.h +index bc08c6c..294aa64 100644 +--- a/window.h ++++ b/window.h +@@ -35,7 +35,7 @@ + + #include "config.h" + +-#include "sched.h" ++#include "eventqueue.h" + #include "logfile.h" + #include "screen.h" + #include "layer.h" +diff --git a/winmsg.c b/winmsg.c +index 2418439..891a20a 100644 +--- a/winmsg.c ++++ b/winmsg.c +@@ -44,7 +44,7 @@ + #include "logfile.h" + #include "mark.h" + #include "process.h" +-#include "sched.h" ++#include "eventqueue.h" + + /* TODO: rid global variable (has been renamed to point this out; see commit + * history) */ +-- +2.46.2 + diff --git a/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch b/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch deleted file mode 100644 index 24df05de8c..0000000000 --- a/package/screen/0005-Renamed-sched.h-to-eventqueue.h.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 8b066a777b61600ff2c60cad0725f2089299ff56 Mon Sep 17 00:00:00 2001 -From: Maarten ter Huurne -Date: Mon, 15 Sep 2014 00:24:41 +0200 -Subject: [PATCH] Renamed sched.h to eventqueue.h - -There is a system header that got shadowed by "sched.h". -While Screen itself doesn't include , other system headers -might include it indirectly. This broke the build when using uClibc -with pthread support. - -Signed-off-by: Maarten ter Huurne -[Julien: rebase on top of 4.9.1] -Signed-off-by: Julien Olivain ---- - sched.h => eventqueue.h | 0 - screen.h | 2 +- - 2 files changed, 1 insertion(+), 1 deletion(-) - rename sched.h => eventqueue.h (100%) - -diff --git a/sched.h b/eventqueue.h -similarity index 100% -rename from sched.h -rename to eventqueue.h -diff --git a/screen.h b/screen.h -index 4823efb..2d51788 100644 ---- a/screen.h -+++ b/screen.h -@@ -43,7 +43,7 @@ - #include "osdef.h" - - #include "ansi.h" --#include "sched.h" -+#include "eventqueue.h" - #include "acls.h" - #include "comm.h" - #include "layer.h" --- -2.41.0 - diff --git a/package/screen/0006-comm.h-now-depends-on-term.h.patch b/package/screen/0006-comm.h-now-depends-on-term.h.patch deleted file mode 100644 index 088dfb340c..0000000000 --- a/package/screen/0006-comm.h-now-depends-on-term.h.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 23a8ca6be87ad374d66854cee66ab758880cc651 Mon Sep 17 00:00:00 2001 -From: Mike Gerwitz -Date: Tue, 24 Dec 2013 22:16:31 -0500 -Subject: [PATCH] comm.h now depends on term.h - -Signed-off-by: Fabrice Fontaine -[Patch retrieved and updated from: -http://git.savannah.gnu.org/cgit/screen.git/commit/?id=39c5f1c] -[Julien: rebase on top of 4.9.1] -Signed-off-by: Julien Olivain ---- - Makefile.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Makefile.in b/Makefile.in -index 4718f08..7082a3e 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -132,7 +132,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 --- -2.41.0 - diff --git a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch b/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch deleted file mode 100644 index d46bf723b8..0000000000 --- a/package/screen/0007-comm.h-needed-for-list_-display-generic-.o.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 8d8899b3ffd26d5049f8a9ccf12ff9ac65c352b4 Mon Sep 17 00:00:00 2001 -From: Fabrice Fontaine -Date: Wed, 3 Oct 2018 22:29:32 +0200 -Subject: [PATCH] comm.h needed for list_{display,generic}.o - -comm.h is needed to build list_display.o and list_generic.o otherwise -parallel builds will sometimes fail - -Fixes: - - http://autobuild.buildroot.org/results/43105f14857dbe72d8878fc7b3db67f7bdca93cc - - http://autobuild.buildroot.org/results/47f4ecbec1355285633df287fc9c4e7cccde9378 - -Signed-off-by: Fabrice Fontaine -[Upstream status: https://savannah.gnu.org/bugs/index.php?54776] -[Julien: rebase on top of 4.9.1] -Signed-off-by: Julien Olivain ---- - Makefile.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index 7082a3e..cd363b7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -349,7 +349,7 @@ layout.o: layout.h viewport.h canvas.h layout.c config.h screen.h os.h osdef.h a - viewport.o: layout.h viewport.h canvas.h viewport.c config.h screen.h os.h osdef.h ansi.h acls.h \ - comm.h layer.h term.h image.h display.h window.h extern.h \ - braille.h --list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h --list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h -+list_generic.o: list_generic.h list_generic.c layer.h screen.h osdef.h comm.h -+list_display.o: list_generic.h list_display.c layer.h screen.h osdef.h comm.h - list_window.o: list_generic.h list_window.c window.h layer.h screen.h osdef.h comm.h - --- -2.41.0 - diff --git a/package/screen/Config.in b/package/screen/Config.in index 40cda77b50..81a9bbe4c3 100644 --- a/package/screen/Config.in +++ b/package/screen/Config.in @@ -1,6 +1,8 @@ config BR2_PACKAGE_SCREEN bool "screen" depends on BR2_USE_MMU # fork() + depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_GCC_AT_LEAST_8 # C17 select BR2_PACKAGE_LIBXCRYPT if BR2_TOOLCHAIN_USES_GLIBC select BR2_PACKAGE_NCURSES help @@ -13,3 +15,8 @@ config BR2_PACKAGE_SCREEN multiple character sets). http://www.gnu.org/software/screen/ + +comment "screen needs a toolchain w/ wchar, gcc >= 8" + depends on BR2_USE_MMU + depends on !BR2_USE_WCHAR || \ + !BR2_TOOLCHAIN_GCC_AT_LEAST_8 diff --git a/package/screen/screen.hash b/package/screen/screen.hash index ef32eb0696..208a9cb36d 100644 --- a/package/screen/screen.hash +++ b/package/screen/screen.hash @@ -1,5 +1,5 @@ # Locally calculated after checking pgp signature -# https://ftp.gnu.org/gnu/screen/screen-4.9.1.tar.gz.sig -sha256 26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69 screen-4.9.1.tar.gz +# https://ftp.gnu.org/gnu/screen/screen-5.0.0.tar.gz.sig +sha256 f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971 screen-5.0.0.tar.gz # Locally calculated -sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING +sha256 e79e9c8a0c85d735ff98185918ec94ed7d175efc377012787aebcf3b80f0d90b COPYING diff --git a/package/screen/screen.mk b/package/screen/screen.mk index 55fecb89bc..9a64780a9a 100644 --- a/package/screen/screen.mk +++ b/package/screen/screen.mk @@ -4,7 +4,7 @@ # ################################################################################ -SCREEN_VERSION = 4.9.1 +SCREEN_VERSION = 5.0.0 SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE_FILES = COPYING