jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-31 15:07:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

screen: bump to version 4.6.2

Browse Source 
Refresh patch #6.

Drop patch #9, parallel build fixed in upstream commit 7dad1f268f12.
Renumber the next patch.

Add reference to upstream signature, and license hash.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Baruch Siach 2017-12-07 21:41:46 +02:00 committed by Peter Korsgaard
parent f6ee339e92
commit 89b30618a5
5 changed files with 8 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/screen/0006-install-no-backup-binary.patch
View File

@ -5,6 +5,8 @@ Subject: Do not create backup of old installed binary
This is a rather unusual feature that packagers will not expect. This is a rather unusual feature that packagers will not expect.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org> Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
[baruch: update for 4.6.2]
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
--- ---
Makefile.in | 4 ---- Makefile.in | 4 ----
1 file changed, 4 deletions(-) 1 file changed, 4 deletions(-)
@ -16,7 +18,7 @@ index 187a69b..65549e9 100644
@@ -83,12 +83,9 @@ screen: $(OFILES) @@ -83,12 +83,9 @@ screen: $(OFILES)
$(OPTIONS) $(CFLAGS) $< $(OPTIONS) $(CFLAGS) $<
install_bin: .version screen install_bin: .version screen installdirs
- -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \ - -if [ -f $(DESTDIR)$(bindir)/$(SCREEN) ] && [ ! -f $(DESTDIR)$(bindir)/$(SCREEN).old ]; \
- then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi - then mv $(DESTDIR)$(bindir)/$(SCREEN) $(DESTDIR)$(bindir)/$(SCREEN).old; fi
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN) $(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)

43
package/screen/0009-install-dir-dependency.patch
View File

@ -1,43 +0,0 @@
From: Maarten ter Huurne <maarten@treewalker.org>
Date: Mon, 15 Sep 2014 02:27:09 +0200
Subject: Ensure that installation dirs exist before copying files into them
Since the "install_bin" target requires the installation directories
to exist, it should depend on the "installdirs" target. The previous
approach of having "install" depend on "installdirs" is not reliable.
For example, in a parallel build, there was no guarantee that
"installdirs" would be finished before "install_bin" runs. Also if
the user requested only "install_bin" to be made, "installdirs" would
be skipped altogether.
Signed-off-by: Maarten ter Huurne <maarten@treewalker.org>
---
Makefile.in | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.in b/Makefile.in
index 860f351..f0fe08d 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -82,7 +82,7 @@ screen: $(OFILES)
$(CC) -c -I. -I$(srcdir) $(M_CFLAGS) $(CPPFLAGS) $(DEFS) \
$(OPTIONS) $(CFLAGS) $<
-install_bin: .version screen
+install_bin: .version screen installdirs
$(INSTALL_PROGRAM) screen $(DESTDIR)$(bindir)/$(SCREEN)
-chown root $(DESTDIR)$(bindir)/$(SCREEN)
-chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
@@ -94,7 +94,7 @@ endif
cp $(srcdir)/utf8encodings/?? $(DESTDIR)$(SCREENENCODINGS)
###############################################################################
-install: installdirs install_bin
+install: install_bin
cd doc ; $(MAKE) install
-if [ -d /usr/lib/terminfo ]; then \
PATH="$$PATH:/usr/5bin" tic ${srcdir}/terminfo/screeninfo.src; \
--
1.8.4.5

0
package/screen/0010-rename-sched_h.patch → package/screen/0009-rename-sched_h.patch
View File

5
package/screen/screen.hash
View File

@ -1,2 +1,5 @@
# Locally calculated after checking pgp signature # Locally calculated after checking pgp signature
sha256 97db2114dd963b016cd4ded34831955dcbe3251e5eee45ac2606e67e9f097b2d screen-4.5.1.tar.gz # https://ftp.gnu.org/gnu/screen/screen-4.6.2.tar.gz.sig
sha256 1b6922520e6a0ce5e28768d620b0f640a6631397f95ccb043b70b91bb503fa3a screen-4.6.2.tar.gz
# Locally calculated
sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 COPYING

2
package/screen/screen.mk
View File

@ -4,7 +4,7 @@
# #
################################################################################ ################################################################################
SCREEN_VERSION = 4.5.1 SCREEN_VERSION = 4.6.2
SCREEN_SITE = $(BR2_GNU_MIRROR)/screen SCREEN_SITE = $(BR2_GNU_MIRROR)/screen
SCREEN_LICENSE = GPL-3.0+ SCREEN_LICENSE = GPL-3.0+
SCREEN_LICENSE_FILES = COPYING SCREEN_LICENSE_FILES = COPYING