From fab5cea25d9b8ea91bce42648214b20d394d7973 Mon Sep 17 00:00:00 2001 From: Markham Date: Tue, 21 Aug 2018 12:27:12 +0200 Subject: [PATCH] bump version libncurses-6.1 --- ...bncurses_workaround_changed_output_of_GNU_cpp_5.x.patch} | 6 +++--- make/versions.mk | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) rename archive-patches/{ncurses_workaround_changed_output_of_GNU_cpp_5.x.patch => libncurses_workaround_changed_output_of_GNU_cpp_5.x.patch} (69%) diff --git a/archive-patches/ncurses_workaround_changed_output_of_GNU_cpp_5.x.patch b/archive-patches/libncurses_workaround_changed_output_of_GNU_cpp_5.x.patch similarity index 69% rename from archive-patches/ncurses_workaround_changed_output_of_GNU_cpp_5.x.patch rename to archive-patches/libncurses_workaround_changed_output_of_GNU_cpp_5.x.patch index 9aa6930..119b1b4 100755 --- a/archive-patches/ncurses_workaround_changed_output_of_GNU_cpp_5.x.patch +++ b/archive-patches/libncurses_workaround_changed_output_of_GNU_cpp_5.x.patch @@ -4,15 +4,15 @@ if test "${LC_CTYPE+set}" = set; then LC_CTYPE=C; export LC_CTYPE; fi if test "${LC_COLLATE+set}" = set; then LC_COLLATE=C; export LC_COLLATE; fi --preprocessor="$1 -DNCURSES_INTERNALS -I../include" +-preprocessor="$1 -DNCURSES_WATTR_MACROS -DNCURSES_INTERNALS -I../include" +# Work around "unexpected" output of GCC > 5.1.0's cpp w.r.t. #line directives +# by simply suppressing them: +case `$1 -dumpversion 2>/dev/null` in + [56].*.*) # assume a "broken" one -+ preprocessor="$1 -P -DNCURSES_INTERNALS -I../include" ++ preprocessor="$1 -DNCURSES_WATTR_MACROS -P -DNCURSES_INTERNALS -I../include" + ;; + *) -+ preprocessor="$1 -DNCURSES_INTERNALS -I../include" ++ preprocessor="$1 -DNCURSES_WATTR_MACROS -DNCURSES_INTERNALS -I../include" +esac AWK="$2" USE="$3" diff --git a/make/versions.mk b/make/versions.mk index a5dfecc..262403b 100644 --- a/make/versions.mk +++ b/make/versions.mk @@ -149,7 +149,7 @@ MC_VER = 4.8.20 MTD_UTILS_VER = 1.5.2 # ncurses; software for controlling writing to the console screen -NCURSES_VER=6.0 +NCURSES_VER=6.1 # The NFS Utilities package contains the userspace server and client tools necessary to use the kernel's NFS abilities. NFS_UTILS_VER = 2.2.1 -- 2.39.5