From a42e25d0bbd7dc536c675143a8e8690c496dac6c Mon Sep 17 00:00:00 2001 From: Dylan Araps Date: Wed, 29 Jan 2020 09:26:58 +0200 Subject: [PATCH] ncurses: Allow conflicts --- extra/ncurses/build | 4 ---- extra/ncurses/version | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/extra/ncurses/build b/extra/ncurses/build index 36ad8513..d64116ca 100755 --- a/extra/ncurses/build +++ b/extra/ncurses/build @@ -27,7 +27,3 @@ done # Some packages look for libcurses instead of libncurses when building. printf '%s\n' "INPUT(-lncursesw)" > "$1/usr/lib/libcursesw.so" ln -s libncurses.so "$1/usr/lib/libcurses.so" - -# These conflict with busybox's. -rm -f "$1/usr/bin/clear" -rm -f "$1/usr/bin/reset" diff --git a/extra/ncurses/version b/extra/ncurses/version index 64ca26e6..6dbf3168 100644 --- a/extra/ncurses/version +++ b/extra/ncurses/version @@ -1 +1 @@ -6.1 2 +6.1 3