bump version libncurses-6.1

diff --git a/archive-patches/libncurses_workaround_changed_output_of_GNU_cpp_5.x.patch b/archive-patches/libncurses_workaround_changed_output_of_GNU_cpp_5.x.patch
new file mode 100755 (executable)
index 0000000..119b1b4
--- /dev/null
+++ b/archive-patches/libncurses_workaround_changed_output_of_GNU_cpp_5.x.patch
@@ -0,0 +1,18 @@
+--- a/ncurses/base/MKlib_gen.sh        2011-06-04 21:14:08.000000000 +0200
++++ b/ncurses/base/MKlib_gen.sh        2015-04-26 00:47:06.911680782 +0200
+@@ -62,7 +62,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_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 -DNCURSES_WATTR_MACROS -P -DNCURSES_INTERNALS -I../include"
++        ;;
++    *)
++        preprocessor="$1 -DNCURSES_WATTR_MACROS -DNCURSES_INTERNALS -I../include"
++esac
+ AWK="$2"
+ USE="$3"

diff --git a/archive-patches/ncurses_workaround_changed_output_of_GNU_cpp_5.x.patch b/archive-patches/ncurses_workaround_changed_output_of_GNU_cpp_5.x.patch
deleted file mode 100755 (executable)
index 9aa6930..0000000
--- a/archive-patches/ncurses_workaround_changed_output_of_GNU_cpp_5.x.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/ncurses/base/MKlib_gen.sh        2011-06-04 21:14:08.000000000 +0200
-+++ b/ncurses/base/MKlib_gen.sh        2015-04-26 00:47:06.911680782 +0200
-@@ -62,7 +62,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"
-+# 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_INTERNALS -I../include"
-+esac
- AWK="$2"
- USE="$3"

diff --git a/make/versions.mk b/make/versions.mk
index a5dfecc06a14654ab9c899d252f9e84c6713be97..262403b302447243e692bd416ac43ad2e87e1243 100644 (file)
--- 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