From 9042ef11a4fef857c65334667e1df834520ebf77200d8b15ce05fc9e97c22491 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Fri, 27 Feb 2015 09:27:46 +0000
Subject: [PATCH] .

OBS-URL: https://build.opensuse.org/package/show/Base:System/ncurses?expand=0&rev=189
---
 ncurses-5.9-overwrite.dif   |  4 +--
 ncurses-5.9-patches.tar.bz2 |  4 +--
 ncurses-5.9.dif             | 58 ++++++++++++++++++-------------------
 ncurses.changes             | 12 ++++++++
 4 files changed, 45 insertions(+), 33 deletions(-)

diff --git a/ncurses-5.9-overwrite.dif b/ncurses-5.9-overwrite.dif
index 1dcc52c..23376cd 100644
--- a/ncurses-5.9-overwrite.dif
+++ b/ncurses-5.9-overwrite.dif
@@ -17,9 +17,9 @@
 +++ configure	2013-09-30 09:17:52.000000000 +0000
 @@ -6799,6 +6799,7 @@ else
  fi;
- echo "$as_me:6892: result: $with_overwrite" >&5
+ echo "$as_me:6899: result: $with_overwrite" >&5
  echo "${ECHO_T}$with_overwrite" >&6
 +WITH_OVERWRITE="$with_overwrite"
  
- echo "$as_me:6895: checking if external terminfo-database is used" >&5
+ echo "$as_me:6902: checking if external terminfo-database is used" >&5
  echo $ECHO_N "checking if external terminfo-database is used... $ECHO_C" >&6
diff --git a/ncurses-5.9-patches.tar.bz2 b/ncurses-5.9-patches.tar.bz2
index 21553a3..8b2432c 100644
--- a/ncurses-5.9-patches.tar.bz2
+++ b/ncurses-5.9-patches.tar.bz2
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:2d568c2fd03e2d9866a612585254fc2549cddae68ffcbfa21602a29956e22999
-size 4347837
+oid sha256:441ddf562bb51a352e1771577cce6c0ac980cd8f2c66725f5b3a934d9d4d5417
+size 4386284
diff --git a/ncurses-5.9.dif b/ncurses-5.9.dif
index a21093f..cf55c47 100644
--- a/ncurses-5.9.dif
+++ b/ncurses-5.9.dif
@@ -32,7 +32,7 @@
  #include <stdio.h>
  
  #if defined(__cplusplus)
-@@ -4428,12 +4428,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4462,12 +4462,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -50,7 +50,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -4443,7 +4446,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4477,7 +4480,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -59,7 +59,7 @@
  CF_EOF
  fi
  
-@@ -4483,7 +4486,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4517,7 +4520,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -68,7 +68,7 @@
  CF_EOF
  fi
  
-@@ -4492,23 +4495,23 @@ case "$MANPAGE_FORMAT" in #(vi
+@@ -4526,23 +4529,23 @@ case "$MANPAGE_FORMAT" in #(vi
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -98,7 +98,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -4517,7 +4520,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4551,7 +4554,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -107,7 +107,7 @@
  							then
  								continue
  							fi
-@@ -4527,18 +4530,18 @@ CF_EOF
+@@ -4561,18 +4564,18 @@ CF_EOF
  case "x$LN_S" in #(vi
  *-f) #(vi
  cat >>$cf_edit_man <<CF_EOF
@@ -129,7 +129,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -4558,9 +4561,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4592,9 +4595,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -142,7 +142,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -4580,6 +4583,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -4614,6 +4617,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -152,7 +152,7 @@
  done
 --- configure.in
 +++ configure.in	2012-01-30 16:31:47.000000000 +0000
-@@ -1877,6 +1877,7 @@ if test "$with_termlib" != no ; then
+@@ -1881,6 +1881,7 @@ if test "$with_termlib" != no ; then
  		TINFO_LDFLAGS="-L${LIB_DIR}"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	fi
@@ -162,7 +162,7 @@
  	TINFO_NAME=${LIB_NAME}
 --- configure
 +++ configure	2012-01-30 16:42:40.000000000 +0000
-@@ -5786,7 +5786,7 @@ irix*) #(vi
+@@ -5797,7 +5797,7 @@ irix*) #(vi
  	fi
  	;;
  linux*|gnu*|k*bsd*-gnu) #(vi
@@ -171,7 +171,7 @@
  	;;
  openbsd[2-9].*|mirbsd*) #(vi
  	LD_RPATH_OPT="-Wl,-rpath,"
-@@ -11163,12 +11163,15 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11268,12 +11268,15 @@ cat >>$cf_edit_man <<CF_EOF
  		echo '? missing rename for '\$cf_source
  		cf_target="\$cf_source"
  	fi
@@ -189,7 +189,7 @@
  	sed	-f $cf_man_alias \\
  CF_EOF
  
-@@ -11178,7 +11181,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11283,7 +11286,7 @@ cat >>$cf_edit_man <<CF_EOF
  CF_EOF
  else
  cat >>$cf_edit_man <<CF_EOF
@@ -198,7 +198,7 @@
  CF_EOF
  fi
  
-@@ -11218,7 +11221,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11323,7 +11326,7 @@ cat >>$cf_edit_man <<CF_EOF
  		mv \$TMP.$cf_so_strip \$TMP
  	fi
  	fi
@@ -207,7 +207,7 @@
  CF_EOF
  fi
  
-@@ -11227,23 +11230,23 @@ case "$MANPAGE_FORMAT" in #(vi
+@@ -11332,23 +11335,23 @@ case "$MANPAGE_FORMAT" in #(vi
  cat >>$cf_edit_man <<CF_EOF
  	if test \$form = format ; then
  		# BSDI installs only .0 suffixes in the cat directories
@@ -237,7 +237,7 @@
  				for cf_alias in \$aliases
  				do
  					if test \$section = 1 ; then
-@@ -11252,7 +11255,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11357,7 +11360,7 @@ cat >>$cf_edit_man <<CF_EOF
  
  					if test "$MANPAGE_SYMLINKS" = yes ; then
  						if test -f \$cf_alias\${suffix} ; then
@@ -246,7 +246,7 @@
  							then
  								continue
  							fi
-@@ -11262,18 +11265,18 @@ CF_EOF
+@@ -11367,18 +11370,18 @@ CF_EOF
  case "x$LN_S" in #(vi
  *-f) #(vi
  cat >>$cf_edit_man <<CF_EOF
@@ -268,7 +268,7 @@
  						echo ".so \$cf_source" >\$TMP
  CF_EOF
  if test -n "$cf_compress" ; then
-@@ -11293,9 +11296,9 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11398,9 +11401,9 @@ cat >>$cf_edit_man <<CF_EOF
  			)
  		)
  	elif test \$verb = removing ; then
@@ -281,7 +281,7 @@
  		)
  		test -d \$cf_subdir\${section} &&
  		test -n "\$aliases" && (
-@@ -11315,6 +11318,7 @@ cat >>$cf_edit_man <<CF_EOF
+@@ -11420,6 +11423,7 @@ cat >>$cf_edit_man <<CF_EOF
  #		echo ".hy 0"
  		cat \$TMP
  	fi
@@ -289,7 +289,7 @@
  	;;
  esac
  done
-@@ -21361,6 +21365,7 @@ if test "$with_termlib" != no ; then
+@@ -21518,6 +21522,7 @@ if test "$with_termlib" != no ; then
  		TINFO_LDFLAGS="-L${LIB_DIR}"
  		SHLIB_LIST="$SHLIB_LIST -l${TINFO_LIB_SUFFIX}"
  	fi
@@ -362,9 +362,9 @@
  called \fIwindows\fR, which can be thought of as two-dimensional
  arrays of characters representing all or part of a CRT screen.
 --- misc/gen-pkgconfig.in
-+++ misc/gen-pkgconfig.in	2014-12-16 11:04:25.674018827 +0000
-@@ -77,7 +77,7 @@ else
- 	fi
++++ misc/gen-pkgconfig.in	2015-02-27 09:15:36.453859292 +0000
+@@ -75,7 +75,7 @@ if test "$includedir" != "/usr/include"
+ 	CFLAGS="$CFLAGS -I\${includedir}"
  fi
  
 -if test "$libdir" = "/usr/lib" ; then
@@ -372,7 +372,7 @@
  	LDFLAGS=
  else
  	LDFLAGS="-L\${libdir}"
-@@ -88,6 +88,7 @@ do
+@@ -86,6 +86,7 @@ do
  	name="${name}"
  
  	desc="ncurses @NCURSES_MAJOR@.@NCURSES_MINOR@"
@@ -380,7 +380,7 @@
  	reqs=
  
  	if test $name = $MAIN_LIBRARY ; then
-@@ -96,9 +97,11 @@ do
+@@ -94,9 +95,11 @@ do
  		desc="$desc terminal interface library"
  	elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then
  		reqs="$PANEL_LIBRARY${suffix}, $MENU_LIBRARY${suffix}, $FORM_LIBRARY${suffix}, $MAIN_LIBRARY${suffix}"
@@ -392,7 +392,7 @@
  		desc="$desc add-on library"
  	fi
  
-@@ -106,6 +109,8 @@ do
+@@ -104,6 +107,8 @@ do
  		if test $name != $TINFO_NAME ; then
  			test -n "$reqs" && reqs="$reqs, "
  			reqs="${reqs}${SUB_LIBRARY}${suffix}"
@@ -401,7 +401,7 @@
  		fi
  	fi
  
-@@ -123,7 +128,7 @@ Description: $desc
+@@ -121,7 +126,7 @@ Description: $desc
  Version: \${version}
  URL: http://invisible-island.net/ncurses
  Requires.private: $reqs
@@ -411,11 +411,11 @@
  Cflags: $CFLAGS
  EOF
 --- misc/ncurses-config.in
-+++ misc/ncurses-config.in	2011-11-17 12:46:49.000000000 +0000
++++ misc/ncurses-config.in	2015-02-27 09:16:29.033518189 +0000
 @@ -98,7 +98,7 @@ while test $# -gt 0; do
  	# compile/link
  	--cflags)
- 		INCS=
+ 		INCS="@PKG_CFLAGS@"
 -		if test "x@WITH_OVERWRITE@" = xno ; then
 +		if test "${THIS%[0-5]*}" != ncurses ; then
  			INCS="$INCS -I${includedir}/${THIS}"
@@ -786,7 +786,7 @@
  ibm5081-c|ibmmpel-c|IBM 5081 1024x1024 256/4096 Megapel enhanced color display,
 --- ncurses/Makefile.in
 +++ ncurses/Makefile.in	2011-02-28 13:39:31.000000000 +0000
-@@ -215,7 +215,7 @@ $(DESTDIR)$(libdir) :
+@@ -216,7 +216,7 @@ $(DESTDIR)$(libdir) :
  ../lib : ; mkdir $@
  
  ./fallback.c : $(tinfo)/MKfallback.sh
diff --git a/ncurses.changes b/ncurses.changes
index ad101b6..bf15274 100644
--- a/ncurses.changes
+++ b/ncurses.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Fri Feb 27 09:18:04 UTC 2015 - werner@suse.de
+
+- Add ncurses patch 20150221
+  + capture define's related to -D_XOPEN_SOURCE from the configure check
+    and add those to the *-config and *.pc files, to simplify use for
+    the wide-character libraries.
+  + modify ncurses.spec to accommodate Fedora21's location of pkg-config
+    directory.
+  + correct sense of "--disable-lib-suffixes" configure option (report
+    by Nicolas Boos, cf: 20140426).
+
 -------------------------------------------------------------------
 Mon Feb 16 10:12:17 UTC 2015 - werner@suse.de