cygwin-ncurses 6.1-20190727HEADmaster

6 files changed, 41 insertions, 45 deletions

diff --git a/.gitignore b/.gitignore
index 7575196..72184da 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1 @@
-/ncurses-6.0.tar.gz
-/ncurses-6.0-*.patch.gz
-/ncurses-6.0-*.tgz
+/ncurses-6.*.tgz
diff --git a/cygwin-ncurses.spec b/cygwin-ncurses.spec
index 6bf9d0e..946b2e5 100644
--- a/cygwin-ncurses.spec
+++ b/cygwin-ncurses.spec
@@ -1,10 +1,10 @@
 %{?cygwin_package_header}
 
-%global patch 20160806
+%global patch 20190727
 
 Name:      cygwin-ncurses
-Version:   6.0
-Release:   7.%{patch}%{?dist}
+Version:   6.1
+Release:   1.%{patch}%{?dist}
 Summary:   Ncurses library for Cygwin toolchain
 
 Group:     Development/Libraries
@@ -12,9 +12,11 @@ License:   MIT
 URL:       http://invisible-island.net/ncurses/
 BuildArch: noarch
 
-Source0:   ftp://invisible-island.net/ncurses/current/ncurses-%{version}-%{patch}.tgz
+Source0:   ftp://ftp.invisible-island.net/ncurses/current/ncurses-%{version}-%{patch}.tgz
 Patch100:  ncurses-config.patch
-Patch101:  ncurses-5.9-abi-version.patch
+Patch101:  ncurses-6.0-abi-version.patch
+
+BuildRequires: gcc
 
 BuildRequires: cygwin32-filesystem
 BuildRequires: cygwin32-binutils
diff --git a/ncurses-5.9-abi-version.patch b/ncurses-5.9-abi-version.patch
deleted file mode 100644
index 111890e..0000000
--- a/ncurses-5.9-abi-version.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- 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-6.0-abi-version.patch b/ncurses-6.0-abi-version.patch
new file mode 100644
index 0000000..146023a
--- /dev/null
+++ b/ncurses-6.0-abi-version.patch
@@ -0,0 +1,22 @@
+--- origsrc/ncurses-6.0-20170121/configure	2017-01-21 10:16:16.000000000 -0600
++++ src/ncurses-6.0-20170121/configure	2017-01-24 22:50:49.111114900 -0600
+@@ -4957,7 +4957,7 @@ test -z "$cf_cv_libtool_version" && unse
+ echo "$as_me: error: Cannot find libtool" >&2;}
+    { (exit 1); exit 1; }; }
+ 	fi
+-	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${libdir} ${LIBTOOL_VERSION} `cut -f1 ${top_srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o'
++	LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${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-6.0-20170121/mk-1st.awk	2016-12-31 11:04:34.000000000 -0600
++++ src/ncurses-6.0-20170121/mk-1st.awk	2017-01-24 22:51:49.813746800 -0600
+@@ -449,7 +449,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 $(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
index 007d6fc..4fcc35b 100644
--- a/ncurses-config.patch
+++ b/ncurses-config.patch
@@ -1,7 +1,7 @@
-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@"
+diff -up ncurses-6.1-20180714/misc/ncurses-config.in.config ncurses-6.1-20180714/misc/ncurses-config.in
+--- ncurses-6.1-20180714/misc/ncurses-config.in.config	2018-06-10 00:29:01.000000000 +0200
++++ ncurses-6.1-20180714/misc/ncurses-config.in	2018-07-16 16:23:22.202581815 +0200
+@@ -40,7 +40,6 @@ exec_prefix="@exec_prefix@"
  
  bindir="@bindir@"
  includedir="@includedir@"
@@ -9,21 +9,17 @@ diff -up ncurses-5.9/misc/ncurses-config.in.config ncurses-5.9/misc/ncurses-conf
  datarootdir="@datarootdir@"
  datadir="@datadir@"
  mandir="@mandir@"
-@@ -85,12 +84,7 @@ while test $# -gt 0; do
+@@ -111,7 +110,7 @@ while test $# -gt 0; do
  ENDECHO
  		;;
  	--libs)
 -		if test "$libdir" = /usr/lib
--		then
++		if true
+ 		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}"
+ 		else
+@@ -155,7 +154,6 @@ ENDECHO
+ 		echo $INCS
  		;;
  	--libdir)
 -		echo "${libdir}"
diff --git a/sources b/sources
index 2067027..ec5447b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1825ff83bf15c9523dc4687ea4a001d4  ncurses-6.0-20160806.tgz
+SHA512 (ncurses-6.1-20190727.tgz) = d08de1ba0f2b15ed0cb85ef56e1be215530355f3ed22d58c24579ca2c21dfbb677b01a5014891f2d17bb0c45632d728d3004f1991fff4c4557e926fc9359e088