summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--groups/211.native_packages_cmdline.group6
-rw-r--r--patches/screen-4.6.2-854c367.local.patch21
2 files changed, 3 insertions, 24 deletions
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index b875a91f..06975a55 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -147,9 +147,9 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
: ${PKG_SBASE_MAKE_INSTALL_VNAME:=PREFIX};
: ${PKG_SBASE_PREFIX:=${PREFIX_NATIVE}/suckless};
: ${PKG_SCREEN_DEPENDS:="ncursesw"};
-: ${PKG_SCREEN_SHA256SUM:=78541cca34ab8b6899228f10dfc36fa31b63d6455ba2a3acab8547af41810c84};
-: ${PKG_SCREEN_VERSION:=4.6.2-854c367};
-: ${PKG_SCREEN_URL:=https://midipix.org/mirror/screen/screen-${PKG_SCREEN_VERSION}.tar.gz};
+: ${PKG_SCREEN_SHA256SUM:=6e11b13d8489925fde25dfb0935bf6ed71f9eb47eff233a181e078fde5655aa1};
+: ${PKG_SCREEN_VERSION:=4.8.0};
+: ${PKG_SCREEN_URL:=https://fossies.org/linux/misc/screen-${PKG_SCREEN_VERSION}.tar.gz};
: ${PKG_SCREEN_CONFIGURE_ARGS_EXTRA:="--disable-pam"};
: ${PKG_SCREEN_IN_TREE:=1};
: ${PKG_SCREEN_MAKEFLAGS_BUILD:=-j1};
diff --git a/patches/screen-4.6.2-854c367.local.patch b/patches/screen-4.6.2-854c367.local.patch
deleted file mode 100644
index a733b0e6..00000000
--- a/patches/screen-4.6.2-854c367.local.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ru screen-4.6.2-854c367.orig/Makefile.in screen-4.6.2-854c367/Makefile.in
---- screen-4.6.2-854c367.orig/Makefile.in 2019-07-05 11:55:51.818882542 +0200
-+++ screen-4.6.2-854c367/Makefile.in 2019-07-05 12:17:53.551869845 +0200
-@@ -32,7 +32,7 @@
- SCREENENCODINGS = $(datadir)/screen/utf8encodings
-
- CC = @CC@
--CFLAGS = @CFLAGS@ -Wall -Wextra -std=c11
-+CFLAGS = @CFLAGS@ -Wall -Wextra -std=c99
- CPPFLAGS = @CPPFLAGS@ -iquote. -DSCREENENCODINGS='"$(SCREENENCODINGS)"' -DBUILD_DATE='"$(BUILD_DATE)"'
- LDFLAGS = @LDFLAGS@
- LIBS = @LIBS@
-@@ -80,7 +80,7 @@
- -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)
-+ -chmod 4755 $(DESTDIR)$(bindir)/$(SCREEN)
- # 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