cygwin-ncurses 6.0-20160305

7 files changed, 155 insertions, 95 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ed15afc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/ncurses-6.0.tar.gz
+/ncurses-6.0-*.patch.gz
diff --git a/cygwin-ncurses.spec b/cygwin-ncurses.spec
index 8458cd7..e9cda7b 100644
--- a/cygwin-ncurses.spec
+++ b/cygwin-ncurses.spec
@@ -1,10 +1,10 @@
 %{?cygwin_package_header}
 
-%global patch 20140524
+%global patch 20160305
 
 Name:      cygwin-ncurses
-Version:   5.9
-Release:   2.%{patch}
+Version:   6.0
+Release:   1.%{patch}%{?dist}
 Summary:   Ncurses library for Cygwin toolchain
 
 Group:     Development/Libraries
@@ -12,8 +12,35 @@ License:   MIT
 URL:       http://invisible-island.net/ncurses/
 BuildArch: noarch
 
-Source0:   ftp://invisible-island.net/ncurses/current/ncurses-%{version}-%{patch}.tgz
-Patch100:  ncurses-5.9-abi-version.patch
+Source0:   ftp://invisible-island.net/ncurses/ncurses-%{version}.tar.gz
+Patch0:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20150810.patch.gz
+Patch1:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20150815.patch.gz
+Patch2:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20150822.patch.gz
+Patch3:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20150905.patch.gz
+Patch4:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20150912.patch.gz
+Patch5:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20150919.patch.gz
+Patch6:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20150926.patch.gz
+Patch7:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151010.patch.gz
+Patch8:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151017.patch.gz
+Patch9:    ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151024.patch.gz
+Patch10:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151101.patch.gz
+Patch11:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151107.patch.gz
+Patch12:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151121.patch.gz
+Patch13:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151128.patch.gz
+Patch14:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151205.patch.gz
+Patch15:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151212.patch.gz
+Patch16:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151219.patch.gz
+Patch17:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20151226.patch.gz
+Patch18:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20160102.patch.gz
+Patch19:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20160116.patch.gz
+Patch20:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20160123.patch.gz
+Patch21:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20160130.patch.gz
+Patch22:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20160206.patch.gz
+Patch23:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20160213.patch.gz
+Patch24:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20160220.patch.gz
+Patch25:   ftp://invisible-island.net/ncurses/%{version}/ncurses-%{version}-20160305.patch.gz
+Patch100:  ncurses-config.patch
+Patch101:  ncurses-5.9-abi-version.patch
 
 BuildRequires: cygwin32-filesystem
 BuildRequires: cygwin32-binutils
@@ -53,8 +80,35 @@ Ncurses library for Cygwin x86_64 toolchain
 
 
 %prep
-%setup -q -n ncurses-%{version}-%{patch}
-%patch100 -p2
+%setup -q -n ncurses-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+%patch18 -p1
+%patch19 -p1
+%patch20 -p1
+%patch21 -p1
+%patch22 -p1
+%patch23 -p1
+%patch24 -p1
+%patch25 -p1
+%patch100 -p1
+%patch101 -p2
 
 
 %build
@@ -68,7 +122,7 @@ CYGWIN64_CONFIGURE_ARGS="--with-libtool=%{_bindir}/%{cygwin64_target}-libtool \
 	--without-debug --disable-relink --disable-rpath \
 	--with-ticlib --without-termlib --enable-widec --enable-ext-colors \
 	--enable-ext-mouse --enable-sp-funcs --enable-reentrant \
-	--with-abi-version=10 --with-wrap-prefix=ncwrap_ \
+	--with-abi-version=10 --enable-lp64 --with-wrap-prefix=ncwrap_ \
 	--enable-sigwinch --enable-colorfgbg --enable-tcap-names \
 	--disable-termcap --disable-mixed-case --enable-symlinks \
 	--with-pkg-config --enable-pc-files --enable-overwrite \
@@ -86,9 +140,9 @@ sed -i -e 's%^\(LIBRARIES[ \t]*=\).*$%\1 ../lib/libncursesw.la ../lib/libticw.la
 for d in %{cygwin32_bindir} %{cygwin64_bindir}
 do
 	pushd $RPM_BUILD_ROOT$d
-	mv ncursesw10-config ncursesw5-config
-	ln -s ncursesw5-config ncurses5-config
-	sed -i -e 's|echo "10"|echo "6"|' ncursesw5-config
+	mv ncursesw10-config ncursesw6-config
+	ln -s ncursesw6-config ncurses6-config
+	sed -i -e 's|echo "10"|echo "6"|' ncursesw6-config
 	popd
 done
 
@@ -129,8 +183,8 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 %{cygwin32_bindir}/cygncurses++w-10.dll
 %{cygwin32_bindir}/cygpanelw-10.dll
 %{cygwin32_bindir}/cygticw-10.dll
-%{cygwin32_bindir}/ncurses5-config
-%{cygwin32_bindir}/ncursesw5-config
+%{cygwin32_bindir}/ncurses6-config
+%{cygwin32_bindir}/ncursesw6-config
 %{cygwin32_includedir}/*.h
 %{cygwin32_includedir}/ncurses/
 %{cygwin32_includedir}/ncursesw/
@@ -167,8 +221,8 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 %{cygwin64_bindir}/cygncurses++w-10.dll
 %{cygwin64_bindir}/cygpanelw-10.dll
 %{cygwin64_bindir}/cygticw-10.dll
-%{cygwin64_bindir}/ncurses5-config
-%{cygwin64_bindir}/ncursesw5-config
+%{cygwin64_bindir}/ncurses6-config
+%{cygwin64_bindir}/ncursesw6-config
 %{cygwin64_includedir}/*.h
 %{cygwin64_includedir}/ncurses/
 %{cygwin64_includedir}/ncursesw/
@@ -199,6 +253,9 @@ find $RPM_BUILD_ROOT -name '*.la' -delete
 
 
 %changelog
+* Wed Mar 30 2016 Yaakov Selkowitz <yselkowi@redhat.com> - 6.0-1
+- new version
+
 * Mon Jul 01 2013 Yaakov Selkowitz <cygwin-ports-general@lists.sourceforge.net> - 5.9-2.20140524
 - Update to latest patch release
 - Build for both Cygwin targets
diff --git a/ncurses-5.7-17.extra.patch b/ncurses-5.7-17.extra.patch
deleted file mode 100644
index 782dc74..0000000
--- a/ncurses-5.7-17.extra.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- origsrc/ncurses-5.7/configure	2009-12-31 11:11:27.771000000 -0500
-+++ src/ncurses-5.7/configure	2009-12-31 11:58:53.766000000 -0500
-@@ -10322,7 +10322,17 @@
- LIBS=`echo "$LIBS" | sed -e 's/-lpthread[ 	]//g' -e 's/-lpthread$//'`
- 
- 	else
--		LIB_SUFFIX="t${LIB_SUFFIX}"
-+		# when not using weak symbols but with_reentrant,
-+		# add 't' to the library suffix on all platforms
-+		# except cygwin, where we only do that if ALSO
-+		# compiling with full thread support.
-+		case "$host" in
-+		*cygwin* )
-+			if test "$with_pthread" = "yes" ; then
-+				LIB_SUFFIX="t${LIB_SUFFIX}"
-+			fi ;;
-+		* ) LIB_SUFFIX="t${LIB_SUFFIX}" ;;
-+		esac
- 	fi
- 	cat >>confdefs.h <<\EOF
- #define USE_REENTRANT 1
diff --git a/ncurses-5.7-18.src.patch b/ncurses-5.7-18.src.patch
deleted file mode 100644
index bfeb3d3..0000000
--- a/ncurses-5.7-18.src.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- origsrc/ncurses-5.7/c++/Makefile.in	2010-01-02 09:09:29.061000000 -0500
-+++ src/ncurses-5.7/c++/Makefile.in	2010-01-02 09:10:21.752000000 -0500
-@@ -161,7 +161,7 @@ LIB_OBJS = \
- 	cd ../lib && $(LIBTOOL_LINK) $(CXX) $(CXXFLAGS) \
- 		-o $(LIBNAME) $(LIB_OBJS:$o=.lo) \
- 		-rpath $(INSTALL_PREFIX)$(libdir) \
--		-version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)
-+		-version-info $(ABI_VERSION):0:0 $(LT_UNDEF) $(SHLIB_LIST)
- 
- OBJS_DEMO = $(MODEL)/demo$o
- 
---- origsrc/ncurses-5.7/configure.in	2010-01-02 09:09:41.557000000 -0500
-+++ src/ncurses-5.7/configure.in	2010-01-02 09:10:21.763000000 -0500
-@@ -1113,7 +1113,17 @@ if test "$with_reentrant" = yes ; then
- 	if test $cf_cv_weak_symbols = yes ; then
- 		CF_REMOVE_LIB(LIBS,$LIBS,pthread)
- 	else
--		LIB_SUFFIX="t${LIB_SUFFIX}"
-+		# when not using weak symbols but with_reentrant,
-+		# add 't' to the library suffix on all platforms
-+		# except cygwin, where we only do that if ALSO
-+		# compiling with full thread support.
-+		case "$host" in
-+		*cygwin* )
-+			if test "$with_pthread" = "yes" ; then
-+				LIB_SUFFIX="t${LIB_SUFFIX}"
-+			fi ;;
-+		* ) LIB_SUFFIX="t${LIB_SUFFIX}" ;;
-+		esac
- 	fi
- 	AC_DEFINE(USE_REENTRANT)
- 	CF_NCURSES_ABI_6
---- origsrc/ncurses-5.7/mk-1st.awk	2010-01-02 09:09:41.572000000 -0500
-+++ src/ncurses-5.7/mk-1st.awk	2010-01-02 09:10:21.774000000 -0500
-@@ -387,11 +387,11 @@ END	{
- 				end_name = lib_name;
- 				printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS
- 				if ( is_ticlib() ) {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS
-+					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(ABI_VERSION):0:0 $(LT_UNDEF) $(TICS_LIST)\n", compile, lib_name, OBJS
- 				} else if ( is_termlib() ) {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS
-+					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(ABI_VERSION):0:0 $(LT_UNDEF) $(TINFO_LIST)\n", compile, lib_name, OBJS
- 				} else {
--					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS
-+					printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) -o %s $(%s_OBJS:$o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(ABI_VERSION):0:0 $(LT_UNDEF) $(SHLIB_LIST)\n", compile, lib_name, OBJS
- 				}
- 				print  ""
- 				print  "install \\"
diff --git a/ncurses-5.9-abi-version.patch b/ncurses-5.9-abi-version.patch
new file mode 100644
index 0000000..111890e
--- /dev/null
+++ b/ncurses-5.9-abi-version.patch
@@ -0,0 +1,22 @@
+--- origsrc/ncurses-5.9/configure	2013-02-17 22:26:26.120661500 -0600
++++ src/ncurses-5.9/configure	2013-02-17 23:04:01.218645700 -0600
+@@ -4372,7 +4372,7 @@ fi
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} ${ABI_VERSION}:0 ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
+ 	LIB_OBJECT='${OBJECTS:.o=.lo}'
+ 	LIB_SUFFIX=.la
+ 	LIB_CLEAN='${LIBTOOL} --mode=clean'
+--- origsrc/ncurses-5.9/mk-1st.awk	2013-05-06 01:53:59.650892700 -0500
++++ src/ncurses-5.9/mk-1st.awk	2013-05-06 02:00:44.355040500 -0500
+@@ -445,7 +445,7 @@ END	{
+ 				printf "\tcd ../lib && $(LIBTOOL_LINK) $(%s) $(%s) \\\n", CC_NAME, CC_FLAG;
+ 				printf "\t\t-o %s $(%s_OBJS:$o=.lo) \\\n", lib_name, OBJS;
+ 				printf "\t\t-rpath $(DESTDIR)$(libdir) \\\n";
+-				printf "\t\t%s $(NCURSES_MAJOR):$(NCURSES_MINOR) $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list;
++				printf "\t\t%s $(ABI_VERSION):0 $(LT_UNDEF) $(%s) $(LDFLAGS)\n", libtool_version, which_list;
+ 				print  ""
+ 				print  "install \\"
+ 				print  "install.libs \\"
diff --git a/ncurses-config.patch b/ncurses-config.patch
new file mode 100644
index 0000000..007d6fc
--- /dev/null
+++ b/ncurses-config.patch
@@ -0,0 +1,32 @@
+diff -up ncurses-5.9/misc/ncurses-config.in.config ncurses-5.9/misc/ncurses-config.in
+--- ncurses-5.9/misc/ncurses-config.in.config	2012-10-15 15:33:36.092521158 +0200
++++ ncurses-5.9/misc/ncurses-config.in	2012-10-15 15:34:55.906581012 +0200
+@@ -35,7 +35,6 @@ exec_prefix="@exec_prefix@"
+ 
+ bindir="@bindir@"
+ includedir="@includedir@"
+-libdir="@libdir@"
+ datarootdir="@datarootdir@"
+ datadir="@datadir@"
+ mandir="@mandir@"
+@@ -85,12 +84,7 @@ while test $# -gt 0; do
+ ENDECHO
+ 		;;
+ 	--libs)
+-		if test "$libdir" = /usr/lib
+-		then
+ 			LIBDIR=
+-		else
+-			LIBDIR=-L$libdir
+-		fi
+ 		if test @TINFO_NAME@ = @LIB_NAME@ ; then
+ 		sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+ 			$LIBDIR @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+@@ -122,7 +116,6 @@ ENDECHO
+ 		echo "${includedir}"
+ 		;;
+ 	--libdir)
+-		echo "${libdir}"
+ 		;;
+ 	--mandir)
+ 		echo "${mandir}"
diff --git a/sources b/sources
index 1ed0dde..98e1896 100644
--- a/sources
+++ b/sources
@@ -1,10 +1,27 @@
-7c840a1fa324d4e971414ae647600fc9  ncurses-5.7-20091107-patch.sh.bz2
-b9834c803a545af13bd7df2491251119  ncurses-5.7-20091114.patch.gz
-90d57d5daec733a7256000f029134689  ncurses-5.7-20091121.patch.gz
-5d4912a28ecf4dcbf7a5288e4c4701c0  ncurses-5.7-20091128.patch.gz
-7e53ee7b989e1b3b34e4ab113aad2cc2  ncurses-5.7-20091205.patch.gz
-ad6066d8efbe165265ad8523b11d5bef  ncurses-5.7-20091212.patch.gz
-ca3955776c148a37915685696e77fd83  ncurses-5.7-20091219.patch.gz
-7a40fca9ae6500cb705087a2c95cf1cf  ncurses-5.7-20091226.patch.gz
-5271edaf81549e31206ac63c7d9840e0  ncurses-5.7-20091227.patch.gz
-cce05daf61a64501ef6cd8da1f727ec6  ncurses-5.7.tar.gz
+ee13d052e1ead260d7c28071f46eefb1  ncurses-6.0.tar.gz
+2addb3f87c533dc7c7c52afaf62abc79  ncurses-6.0-20150810.patch.gz
+4db32fa467507f087c4d54f12770e399  ncurses-6.0-20150815.patch.gz
+b591a06ea10fe00b320e9b5aecf939ec  ncurses-6.0-20150822.patch.gz
+9f12c80f9b99afab25f0ebbb3ada3d05  ncurses-6.0-20150905.patch.gz
+f11c2a5381ac75ddd1afd4a5cc6baa60  ncurses-6.0-20150912.patch.gz
+c25d0b997c37395b243da3ee68013471  ncurses-6.0-20150919.patch.gz
+e9059272b061ddd78d0e27fc84b3e9da  ncurses-6.0-20150926.patch.gz
+eaee1c3b67f2189921efd7d336d412f1  ncurses-6.0-20151010.patch.gz
+746bb7a761dcf895a08871285b96f769  ncurses-6.0-20151017.patch.gz
+d86fd80f87f12951dadf3a9abc834397  ncurses-6.0-20151024.patch.gz
+ad7fd777cbd6860ee8072334b2ed253f  ncurses-6.0-20151101.patch.gz
+1fffd21c5dc95acbe7c750d88ab9e5b9  ncurses-6.0-20151107.patch.gz
+d0cd4fc89d80cc6dde53bfecccc99e91  ncurses-6.0-20151121.patch.gz
+7cec35c9fe1d5e67f766e18b06b952d3  ncurses-6.0-20151128.patch.gz
+4030838f2cdc8421616746fcb760d82f  ncurses-6.0-20151205.patch.gz
+cef64383b4b7449d0bde80dd33c206c9  ncurses-6.0-20151212.patch.gz
+4afa817af2138d2336867f6cd09e2805  ncurses-6.0-20151219.patch.gz
+703c7e1d703d834b494eb1a3671b8025  ncurses-6.0-20151226.patch.gz
+c94c6b0c7101f026ec5bdbeaff8cf5bd  ncurses-6.0-20160102.patch.gz
+bb79c2eb13e41aabed7acc0b6f9faf1a  ncurses-6.0-20160116.patch.gz
+8ff593bc525448b8e280d9acc01f36de  ncurses-6.0-20160123.patch.gz
+2086aa731a80288486c65d092155e78f  ncurses-6.0-20160130.patch.gz
+6e45df693d060cca77091ea7cc900135  ncurses-6.0-20160206.patch.gz
+9729de400787eb884e0ca85778591b5c  ncurses-6.0-20160213.patch.gz
+b0f2b48dcc10e7c373ef41c55e329e1b  ncurses-6.0-20160220.patch.gz
+75d3b868fe409e4233c629092ccc95b0  ncurses-6.0-20160305.patch.gz