summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--patches/screen-4.6.2-854c367.local.patch21
-rw-r--r--vars/build.vars8
2 files changed, 28 insertions, 1 deletions
diff --git a/patches/screen-4.6.2-854c367.local.patch b/patches/screen-4.6.2-854c367.local.patch
new file mode 100644
index 00000000..a733b0e6
--- /dev/null
+++ b/patches/screen-4.6.2-854c367.local.patch
@@ -0,0 +1,21 @@
+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
diff --git a/vars/build.vars b/vars/build.vars
index 2b00254b..3c76d3d8 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1026,7 +1026,7 @@ NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python2";
# Packages list native_packages_cmdline
NATIVE_PACKAGES_CMDLINE_PACKAGES="
bash bc busybox calcurse coreutils dash datamash dos2unix ed figlet findutils
-gawk grep mksh ksh_openbsd moon_buggy mpg123 ninvaders rc sbase sed sloccount tar tcsh
+gawk grep mksh ksh_openbsd moon_buggy mpg123 ninvaders rc sbase screen sed sloccount tar tcsh
the_silver_searcher toilet tree terminally_tetris ubase which w3m zsh";
: ${PKG_BASH_SHA256SUM:=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb};
: ${PKG_BASH_VERSION:=4.4};
@@ -1126,6 +1126,12 @@ the_silver_searcher toilet tree terminally_tetris ubase which w3m zsh";
: ${PKG_SBASE_IN_TREE:=1};
: ${PKG_SBASE_MAKE_INSTALL_VNAME:=PREFIX};
: ${PKG_SBASE_PREFIX:=${PREFIX_NATIVE}/suckless};
+: ${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_CONFIGURE_ARGS_EXTRA:="--disable-pam"};
+: ${PKG_SCREEN_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_SCREEN_IN_TREE:=1};
: ${PKG_SED_SHA256SUM:=2885768cd0a29ff8d58a6280a270ff161f6a3deb5690b2be6c49f46d4c67bd6a};
: ${PKG_SED_VERSION:=4.7};
: ${PKG_SED_URL:=https://ftp.gnu.org/gnu/sed/sed-${PKG_SED_VERSION}.tar.xz};