From b4baa7a859c48f7f62025440f3eac136b37e9ea61f4e91d1b033a3834fd21ef5 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Tue, 2 Nov 2021 08:52:04 +0000
Subject: [PATCH] Update to ncurses patch 20211030

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=577
---
 ncurses-6.3-patches.tar.bz2        |  4 ++--
 ncurses-6.2.dif => ncurses-6.3.dif | 36 +++++++++++++++---------------
 ncurses.changes                    | 19 ++++++++++++++++
 ncurses.spec                       |  2 +-
 4 files changed, 40 insertions(+), 21 deletions(-)
 rename ncurses-6.2.dif => ncurses-6.3.dif (96%)

diff --git a/ncurses-6.3-patches.tar.bz2 b/ncurses-6.3-patches.tar.bz2
index 7fbf102..85bdb05 100644
--- a/ncurses-6.3-patches.tar.bz2
+++ b/ncurses-6.3-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a072f8968be854f67d580752e70d66d2478424c6fd8a4d8d4bffd3a837ae7b4d
-size 230
+oid sha256:7792e33c3452f29ec76f8a8f2f3f5033955808398bc5bbe0e1ba49f3729da2ec
+size 104582
diff --git a/ncurses-6.2.dif b/ncurses-6.3.dif
similarity index 96%
rename from ncurses-6.2.dif
rename to ncurses-6.3.dif
index 9eb7aac..e6599c9 100644
--- a/ncurses-6.2.dif
+++ b/ncurses-6.3.dif
@@ -28,7 +28,7 @@
  #include <stdio.h>
  
  #if defined(__cplusplus)
-@@ -5803,12 +5803,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5834,12 +5834,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo "? missing rename for \$cf_source"
  		cf_target="\$cf_source"
  	fi
@@ -46,7 +46,7 @@
  	sed	-f "$cf_man_alias" \\
  CF_EOF
  
-@@ -5818,7 +5821,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5849,7 +5852,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -55,7 +55,7 @@
  CF_EOF
  fi
  
-@@ -5858,7 +5861,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5889,7 +5892,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -64,7 +64,7 @@
  CF_EOF
  fi
  
-@@ -5867,23 +5870,23 @@ case "$MANPAGE_FORMAT" in
+@@ -5898,23 +5901,23 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test "\$form" = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -94,7 +94,7 @@
  				for cf_alias in \$aliases
  				do
  					if test "\$section" = 1 ; then
-@@ -5892,7 +5895,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5923,7 +5926,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f "\$cf_alias\${suffix}" ; then
@@ -103,7 +103,7 @@
  							then
  								continue
  							fi
-@@ -5902,18 +5905,18 @@ CF_EOF
+@@ -5933,18 +5936,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -125,7 +125,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -5933,9 +5936,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5964,9 +5967,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test "\$verb" = removing ; then
@@ -138,7 +138,7 @@
  		)
  		test -d "\$cf_subdir\${section}" &&
  		test -n "\$aliases" && (
-@@ -5955,6 +5958,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -5986,6 +5989,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -148,7 +148,7 @@
  done
 --- configure
 +++ configure	2021-06-07 07:18:38.420598827 +0000
-@@ -5941,7 +5941,7 @@ echo $ECHO_N "checking for an rpath opti
+@@ -5936,7 +5936,7 @@ echo $ECHO_N "checking for an rpath opti
  		fi
  		;;
  	(linux*|gnu*|k*bsd*-gnu|freebsd*)
@@ -157,7 +157,7 @@
  		;;
  	(openbsd[2-9].*|mirbsd*)
  		LD_RPATH_OPT="-Wl,-rpath,"
-@@ -7554,7 +7554,7 @@ echo "${ECHO_T}$with_pcre2" >&6
+@@ -7549,7 +7549,7 @@ echo "${ECHO_T}$with_pcre2" >&6
  
  if test "x$with_pcre2" != xno ; then
  	cf_with_pcre2_ok=no
@@ -166,7 +166,7 @@
  	do
  
  if test "$PKG_CONFIG" != none && "$PKG_CONFIG" --exists "$cf_with_pcre2"; then
-@@ -14834,12 +14834,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14829,12 +14829,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo "? missing rename for \$cf_source"
  		cf_target="\$cf_source"
  	fi
@@ -184,7 +184,7 @@
  	sed	-f "$cf_man_alias" \\
  CF_EOF
  
-@@ -14849,7 +14852,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14844,7 +14847,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -193,7 +193,7 @@
  CF_EOF
  fi
  
-@@ -14889,7 +14892,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14884,7 +14887,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -202,7 +202,7 @@
  CF_EOF
  fi
  
-@@ -14898,23 +14901,23 @@ case "$MANPAGE_FORMAT" in
+@@ -14893,23 +14896,23 @@ case "$MANPAGE_FORMAT" in
  cat >>$cf_edit_man <<CF_EOF
  	if test "\$form" = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -232,7 +232,7 @@
  				for cf_alias in \$aliases
  				do
  					if test "\$section" = 1 ; then
-@@ -14923,7 +14926,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14918,7 +14921,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f "\$cf_alias\${suffix}" ; then
@@ -241,7 +241,7 @@
  							then
  								continue
  							fi
-@@ -14933,18 +14936,18 @@ CF_EOF
+@@ -14928,18 +14931,18 @@ CF_EOF
  case "x$LN_S" in
  (*-f)
  cat >>$cf_edit_man <<CF_EOF
@@ -263,7 +263,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -14964,9 +14967,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14959,9 +14962,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test "\$verb" = removing ; then
@@ -276,7 +276,7 @@
  		)
  		test -d "\$cf_subdir\${section}" &&
  		test -n "\$aliases" && (
-@@ -14986,6 +14989,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -14981,6 +14984,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
diff --git a/ncurses.changes b/ncurses.changes
index a838552..f4a9961 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Tue Nov  2 08:34:24 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20211030
+  + simplify some references to WINDOWS._flags using macros.
+  + add a "check" rule in Ada95 makefile, to help with test-packages.
+  + build-fix for cross-compiling to MingW, conditionally add -lssp
+- Correct offsets of patch ncurses-6.3.dif
+
+-------------------------------------------------------------------
+Wed Oct 27 06:30:02 UTC 2021 - Dr. Werner Fink <werner@suse.de>
+
+- Add ncurses patch 20211026
+  + corrected regex needed for older pkg-config used in Solaris 10.
+  + amend configure option's auto-search to account for systems where
+    none of the directories known to pkg-config exist, adapted from
+    mailing-list comment (report by Milan P. Stanic).
+- Port patch ncurses-6.2.dif which is now named ncurses-6.3.dif
+
 -------------------------------------------------------------------
 Fri Oct 22 10:08:10 UTC 2021 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/ncurses.spec b/ncurses.spec
index 1362efc..ab90207 100644
--- a/ncurses.spec
+++ b/ncurses.spec
@@ -88,7 +88,7 @@ Source8:        cursescheck
 Source9:        ftp://ftp.invisible-island.net/ncurses/ncurses-%{basevers}.tar.gz.asc
 Source10:       ftp://ftp.invisible-island.net/pub/ncurses/current/tack-1.09-20210619.tgz.asc
 Source11:       ncurses.keyring
-Patch0:         ncurses-6.2.dif
+Patch0:         ncurses-6.3.dif
 Patch1:         ncurses-5.9-ibm327x.dif
 Patch2:         ncurses-5.7-tack.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build