1# ncurses 6.1 - patch 20190914 - Thomas E. Dickey 2# 3# ------------------------------------------------------------------------------ 4# 5# Ncurses 6.1 is at 6# ftp.gnu.org:/pub/gnu 7# 8# Patches for ncurses 6.1 can be found at 9# ftp://ftp.invisible-island.net/ncurses/6.1 10# http://invisible-mirror.net/archives/ncurses/6.1 11# 12# ------------------------------------------------------------------------------ 13# ftp://ftp.invisible-island.net/ncurses/6.1/ncurses-6.1-20190914.patch.gz 14# patch by Thomas E. Dickey <dickey@invisible-island.net> 15# created Sun Sep 15 01:08:42 UTC 2019 16# ------------------------------------------------------------------------------ 17# Ada95/configure | 29 +++++++++++++++-------------- 18# Ada95/configure.in | 5 +++-- 19# Ada95/package/AdaCurses.spec | 22 ++++++++++++++++------ 20# NEWS | 5 ++++- 21# VERSION | 2 +- 22# dist.mk | 4 ++-- 23# package/debian-mingw/changelog | 4 ++-- 24# package/debian-mingw64/changelog | 4 ++-- 25# package/debian/changelog | 4 ++-- 26# package/mingw-ncurses.nsi | 4 ++-- 27# package/mingw-ncurses.spec | 2 +- 28# package/ncurses.spec | 2 +- 29# package/ncursest.spec | 2 +- 30# 13 files changed, 52 insertions(+), 37 deletions(-) 31# ------------------------------------------------------------------------------ 32Index: Ada95/configure 33--- ncurses-6.1-20190907+/Ada95/configure 2019-09-07 23:37:18.000000000 +0000 34+++ ncurses-6.1-20190914/Ada95/configure 2019-09-14 19:53:04.000000000 +0000 35@@ -1,5 +1,5 @@ 36 #! /bin/sh 37-# From configure.in Revision: 1.72 . 38+# From configure.in Revision: 1.73 . 39 # Guess values for system-dependent variables and create Makefiles. 40 # Generated by Autoconf 2.52.20190901. 41 # 42@@ -16564,7 +16564,7 @@ 43 ADAGEN_LDFLAGS='$(NATIVE_LDFLAGS)' 44 fi 45 46-ac_config_files="$ac_config_files $SUB_MAKEFILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile" 47+ac_config_files="$ac_config_files $SUB_MAKEFILES src/library.gpr:src/library.gpr.in doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in Makefile" 48 ac_config_commands="$ac_config_commands default" 49 cat >confcache <<\_ACEOF 50 # This file is a shell script that caches the results of configure 51@@ -16907,11 +16907,12 @@ 52 case "$ac_config_target" in 53 # Handling of arguments. 54 "$SUB_MAKEFILES" ) CONFIG_FILES="$CONFIG_FILES $SUB_MAKEFILES" ;; 55+ "src/library.gpr" ) CONFIG_FILES="$CONFIG_FILES src/library.gpr:src/library.gpr.in" ;; 56 "doc/adacurses${DFT_ARG_SUFFIX}-config.1" ) CONFIG_FILES="$CONFIG_FILES doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in" ;; 57 "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; 58 "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; 59 "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;; 60- *) { { echo "$as_me:16914: error: invalid argument: $ac_config_target" >&5 61+ *) { { echo "$as_me:16915: error: invalid argument: $ac_config_target" >&5 62 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} 63 { (exit 1); exit 1; }; };; 64 esac 65@@ -17264,7 +17265,7 @@ 66 esac 67 68 if test x"$ac_file" != x-; then 69- { echo "$as_me:17267: creating $ac_file" >&5 70+ { echo "$as_me:17268: creating $ac_file" >&5 71 echo "$as_me: creating $ac_file" >&6;} 72 rm -f "$ac_file" 73 fi 74@@ -17282,7 +17283,7 @@ 75 -) echo $tmp/stdin ;; 76 [\\/$]*) 77 # Absolute (can't be DOS-style, as IFS=:) 78- test -f "$f" || { { echo "$as_me:17285: error: cannot find input file: $f" >&5 79+ test -f "$f" || { { echo "$as_me:17286: error: cannot find input file: $f" >&5 80 echo "$as_me: error: cannot find input file: $f" >&2;} 81 { (exit 1); exit 1; }; } 82 echo $f;; 83@@ -17295,7 +17296,7 @@ 84 echo $srcdir/$f 85 else 86 # /dev/null tree 87- { { echo "$as_me:17298: error: cannot find input file: $f" >&5 88+ { { echo "$as_me:17299: error: cannot find input file: $f" >&5 89 echo "$as_me: error: cannot find input file: $f" >&2;} 90 { (exit 1); exit 1; }; } 91 fi;; 92@@ -17311,7 +17312,7 @@ 93 if test -n "$ac_seen"; then 94 ac_used=`grep '@datarootdir@' $ac_item` 95 if test -z "$ac_used"; then 96- { echo "$as_me:17314: WARNING: datarootdir was used implicitly but not set: 97+ { echo "$as_me:17315: WARNING: datarootdir was used implicitly but not set: 98 $ac_seen" >&5 99 echo "$as_me: WARNING: datarootdir was used implicitly but not set: 100 $ac_seen" >&2;} 101@@ -17320,7 +17321,7 @@ 102 fi 103 ac_seen=`grep '${datarootdir}' $ac_item` 104 if test -n "$ac_seen"; then 105- { echo "$as_me:17323: WARNING: datarootdir was used explicitly but not set: 106+ { echo "$as_me:17324: WARNING: datarootdir was used explicitly but not set: 107 $ac_seen" >&5 108 echo "$as_me: WARNING: datarootdir was used explicitly but not set: 109 $ac_seen" >&2;} 110@@ -17357,7 +17358,7 @@ 111 ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` 112 if test -z "$ac_init"; then 113 ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` 114- { echo "$as_me:17360: WARNING: Variable $ac_name is used but was not set: 115+ { echo "$as_me:17361: WARNING: Variable $ac_name is used but was not set: 116 $ac_seen" >&5 117 echo "$as_me: WARNING: Variable $ac_name is used but was not set: 118 $ac_seen" >&2;} 119@@ -17368,7 +17369,7 @@ 120 egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out 121 if test -s $tmp/out; then 122 ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` 123- { echo "$as_me:17371: WARNING: Some variables may not be substituted: 124+ { echo "$as_me:17372: WARNING: Some variables may not be substituted: 125 $ac_seen" >&5 126 echo "$as_me: WARNING: Some variables may not be substituted: 127 $ac_seen" >&2;} 128@@ -17417,7 +17418,7 @@ 129 * ) ac_file_in=$ac_file.in ;; 130 esac 131 132- test x"$ac_file" != x- && { echo "$as_me:17420: creating $ac_file" >&5 133+ test x"$ac_file" != x- && { echo "$as_me:17421: creating $ac_file" >&5 134 echo "$as_me: creating $ac_file" >&6;} 135 136 # First look for the input files in the build tree, otherwise in the 137@@ -17428,7 +17429,7 @@ 138 -) echo $tmp/stdin ;; 139 [\\/$]*) 140 # Absolute (can't be DOS-style, as IFS=:) 141- test -f "$f" || { { echo "$as_me:17431: error: cannot find input file: $f" >&5 142+ test -f "$f" || { { echo "$as_me:17432: error: cannot find input file: $f" >&5 143 echo "$as_me: error: cannot find input file: $f" >&2;} 144 { (exit 1); exit 1; }; } 145 echo $f;; 146@@ -17441,7 +17442,7 @@ 147 echo $srcdir/$f 148 else 149 # /dev/null tree 150- { { echo "$as_me:17444: error: cannot find input file: $f" >&5 151+ { { echo "$as_me:17445: error: cannot find input file: $f" >&5 152 echo "$as_me: error: cannot find input file: $f" >&2;} 153 { (exit 1); exit 1; }; } 154 fi;; 155@@ -17499,7 +17500,7 @@ 156 rm -f $tmp/in 157 if test x"$ac_file" != x-; then 158 if cmp -s $ac_file $tmp/config.h 2>/dev/null; then 159- { echo "$as_me:17502: $ac_file is unchanged" >&5 160+ { echo "$as_me:17503: $ac_file is unchanged" >&5 161 echo "$as_me: $ac_file is unchanged" >&6;} 162 else 163 ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ 164Index: Ada95/configure.in 165Prereq: 1.72 166--- ncurses-6.1-20190907+/Ada95/configure.in 2019-09-07 22:50:06.000000000 +0000 167+++ ncurses-6.1-20190914/Ada95/configure.in 2019-09-14 19:33:07.000000000 +0000 168@@ -28,14 +28,14 @@ 169 dnl 170 dnl Author: Thomas E. Dickey 171 dnl 172-dnl $Id: configure.in,v 1.72 2019/09/07 22:50:06 tom Exp $ 173+dnl $Id: configure.in,v 1.73 2019/09/14 19:33:07 tom Exp $ 174 dnl Process this file with autoconf to produce a configure script. 175 dnl 176 dnl See https://invisible-island.net/autoconf/ for additional information. 177 dnl 178 dnl --------------------------------------------------------------------------- 179 AC_PREREQ(2.52.20030208) 180-AC_REVISION($Revision: 1.72 $) 181+AC_REVISION($Revision: 1.73 $) 182 AC_INIT(gen/gen.c) 183 AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) 184 185@@ -609,6 +609,7 @@ 186 187 AC_OUTPUT( \ 188 $SUB_MAKEFILES \ 189+ src/library.gpr:src/library.gpr.in \ 190 doc/adacurses${DFT_ARG_SUFFIX}-config.1:doc/MKada_config.in \ 191 Makefile,[ 192 if test -z "$USE_OLD_MAKERULES" ; then 193Index: Ada95/package/AdaCurses.spec 194Prereq: 1.19 195--- ncurses-6.1-20190907+/Ada95/package/AdaCurses.spec 2019-09-08 01:00:18.000000000 +0000 196+++ ncurses-6.1-20190914/Ada95/package/AdaCurses.spec 2019-09-15 00:07:32.000000000 +0000 197@@ -2,7 +2,7 @@ 198 %define AppProgram AdaCurses 199 %define AppVersion MAJOR.MINOR 200 %define AppRelease YYYYMMDD 201-# $Id: AdaCurses.spec,v 1.19 2019/09/08 01:00:18 tom Exp $ 202+# $Id: AdaCurses.spec,v 1.24 2019/09/15 00:07:32 tom Exp $ 203 Name: %{AppProgram} 204 Version: %{AppVersion} 205 Release: %{AppRelease} 206@@ -22,9 +22,13 @@ 207 208 %define debug_package %{nil} 209 210+%define need_filter %(if grep -E -i '(mageia|red hat|fedora)' /etc/issue >/dev/null; then echo 1; elif test -f /etc/fedora-release; then echo 1; else echo 0; fi) 211+ 212+%if %{need_filter} == 1 213 # http://fedoraproject.org/wiki/EPEL:Packaging_Autoprovides_and_Requires_Filtering 214 %filter_from_requires /lib%{AppProgram}.so.1/d 215 %filter_setup 216+%endif 217 218 %setup -q -n %{AppProgram}-%{AppRelease} 219 220@@ -52,12 +56,12 @@ 221 %install 222 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT 223 224-make install DESTDIR=$RPM_BUILD_ROOT 225+make install DESTDIR=$RPM_BUILD_ROOT 226 227 ( cd samples && 228 make install.examples \ 229- DESTDIR=$RPM_BUILD_ROOT \ 230- BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram} 231+ DESTDIR=$RPM_BUILD_ROOT \ 232+ BINDIR=$RPM_BUILD_ROOT%{_bindir}/%{AppProgram} 233 ) 234 235 %clean 236@@ -67,14 +71,20 @@ 237 %defattr(-,root,root) 238 %{_bindir}/adacurses*-config 239 %{_bindir}/%{AppProgram}/* 240-%{ada_libdir}/lib%{AppProgram}.* 241+%{ada_libdir}/ 242+%if %{need_filter} == 1 243+%{_libdir}/lib%{AppProgram}.* 244+%endif 245 %{_mandir}/man1/adacurses*-config.1* 246 %{_datadir}/%{AppProgram}/* 247-%{ada_include}/terminal_interface* 248+%{ada_include}/ 249 250 %changelog 251 # each patch should add its ChangeLog entries here 252 253+* Sat Sep 14 2019 Thomas Dickey 254+- build-fixes for Fedora29, OpenSUSE 255+ 256 * Sat Sep 07 2019 Thomas Dickey 257 - use AppProgram to replace "AdaCurses" globally 258 - amend install-paths to work with Fedora30 259Index: NEWS 260Prereq: 1.3371 261--- ncurses-6.1-20190907+/NEWS 2019-09-07 22:41:16.000000000 +0000 262+++ ncurses-6.1-20190914/NEWS 2019-09-14 23:18:21.000000000 +0000 263@@ -25,7 +25,7 @@ 264 -- sale, use or other dealings in this Software without prior written -- 265 -- authorization. -- 266 ------------------------------------------------------------------------------- 267--- $Id: NEWS,v 1.3371 2019/09/07 22:41:16 tom Exp $ 268+-- $Id: NEWS,v 1.3373 2019/09/14 23:18:21 tom Exp $ 269 ------------------------------------------------------------------------------- 270 271 This is a log of changes that ncurses has gone through since Zeyd started 272@@ -45,6 +45,9 @@ 273 Changes through 1.9.9e did not credit all contributions; 274 it is not possible to add this information. 275 276+20190914 277+ + build-fixes for Ada95 configure-script and corresponding test package 278+ 279 20190907 280 + add --with-ada-libname option and modify Ada95 configuration to 281 allow renaming the "AdaCurses" library (prompted by proposed changes 282Index: VERSION 283--- ncurses-6.1-20190907+/VERSION 2019-09-07 15:19:35.000000000 +0000 284+++ ncurses-6.1-20190914/VERSION 2019-09-14 13:43:52.000000000 +0000 285@@ -1 +1 @@ 286-5:0:10 6.1 20190907 287+5:0:10 6.1 20190914 288Index: dist.mk 289Prereq: 1.1304 290--- ncurses-6.1-20190907+/dist.mk 2019-09-07 15:19:35.000000000 +0000 291+++ ncurses-6.1-20190914/dist.mk 2019-09-14 13:43:52.000000000 +0000 292@@ -25,7 +25,7 @@ 293 # use or other dealings in this Software without prior written # 294 # authorization. # 295 ############################################################################## 296-# $Id: dist.mk,v 1.1304 2019/09/07 15:19:35 tom Exp $ 297+# $Id: dist.mk,v 1.1305 2019/09/14 13:43:52 tom Exp $ 298 # Makefile for creating ncurses distributions. 299 # 300 # This only needs to be used directly as a makefile by developers, but 301@@ -37,7 +37,7 @@ 302 # These define the major/minor/patch versions of ncurses. 303 NCURSES_MAJOR = 6 304 NCURSES_MINOR = 1 305-NCURSES_PATCH = 20190907 306+NCURSES_PATCH = 20190914 307 308 # We don't append the patch to the version, since this only applies to releases 309 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 310Index: package/debian-mingw/changelog 311--- ncurses-6.1-20190907+/package/debian-mingw/changelog 2019-09-07 15:19:35.000000000 +0000 312+++ ncurses-6.1-20190914/package/debian-mingw/changelog 2019-09-14 13:43:52.000000000 +0000 313@@ -1,8 +1,8 @@ 314-ncurses6 (6.1+20190907) unstable; urgency=low 315+ncurses6 (6.1+20190914) unstable; urgency=low 316 317 * latest weekly patch 318 319- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Sep 2019 11:19:35 -0400 320+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400 321 322 ncurses6 (5.9-20131005) unstable; urgency=low 323 324Index: package/debian-mingw64/changelog 325--- ncurses-6.1-20190907+/package/debian-mingw64/changelog 2019-09-07 15:19:35.000000000 +0000 326+++ ncurses-6.1-20190914/package/debian-mingw64/changelog 2019-09-14 13:43:52.000000000 +0000 327@@ -1,8 +1,8 @@ 328-ncurses6 (6.1+20190907) unstable; urgency=low 329+ncurses6 (6.1+20190914) unstable; urgency=low 330 331 * latest weekly patch 332 333- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Sep 2019 11:19:35 -0400 334+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400 335 336 ncurses6 (5.9-20131005) unstable; urgency=low 337 338Index: package/debian/changelog 339--- ncurses-6.1-20190907+/package/debian/changelog 2019-09-07 15:19:35.000000000 +0000 340+++ ncurses-6.1-20190914/package/debian/changelog 2019-09-14 13:43:52.000000000 +0000 341@@ -1,8 +1,8 @@ 342-ncurses6 (6.1+20190907) unstable; urgency=low 343+ncurses6 (6.1+20190914) unstable; urgency=low 344 345 * latest weekly patch 346 347- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 07 Sep 2019 11:19:35 -0400 348+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 14 Sep 2019 09:43:52 -0400 349 350 ncurses6 (5.9-20120608) unstable; urgency=low 351 352Index: package/mingw-ncurses.nsi 353Prereq: 1.350 354--- ncurses-6.1-20190907+/package/mingw-ncurses.nsi 2019-09-07 15:19:35.000000000 +0000 355+++ ncurses-6.1-20190914/package/mingw-ncurses.nsi 2019-09-14 13:43:52.000000000 +0000 356@@ -1,4 +1,4 @@ 357-; $Id: mingw-ncurses.nsi,v 1.350 2019/09/07 15:19:35 tom Exp $ 358+; $Id: mingw-ncurses.nsi,v 1.351 2019/09/14 13:43:52 tom Exp $ 359 360 ; TODO add examples 361 ; TODO bump ABI to 6 362@@ -10,7 +10,7 @@ 363 !define VERSION_MAJOR "6" 364 !define VERSION_MINOR "1" 365 !define VERSION_YYYY "2019" 366-!define VERSION_MMDD "0907" 367+!define VERSION_MMDD "0914" 368 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} 369 370 !define MY_ABI "5" 371Index: package/mingw-ncurses.spec 372--- ncurses-6.1-20190907+/package/mingw-ncurses.spec 2019-09-07 15:19:35.000000000 +0000 373+++ ncurses-6.1-20190914/package/mingw-ncurses.spec 2019-09-14 13:43:52.000000000 +0000 374@@ -3,7 +3,7 @@ 375 Summary: shared libraries for terminal handling 376 Name: mingw32-ncurses6 377 Version: 6.1 378-Release: 20190907 379+Release: 20190914 380 License: X11 381 Group: Development/Libraries 382 Source: ncurses-%{version}-%{release}.tgz 383Index: package/ncurses.spec 384--- ncurses-6.1-20190907+/package/ncurses.spec 2019-09-07 15:19:35.000000000 +0000 385+++ ncurses-6.1-20190914/package/ncurses.spec 2019-09-14 13:43:52.000000000 +0000 386@@ -1,7 +1,7 @@ 387 Summary: shared libraries for terminal handling 388 Name: ncurses6 389 Version: 6.1 390-Release: 20190907 391+Release: 20190914 392 License: X11 393 Group: Development/Libraries 394 Source: ncurses-%{version}-%{release}.tgz 395Index: package/ncursest.spec 396--- ncurses-6.1-20190907+/package/ncursest.spec 2019-09-07 15:19:35.000000000 +0000 397+++ ncurses-6.1-20190914/package/ncursest.spec 2019-09-14 13:43:52.000000000 +0000 398@@ -1,7 +1,7 @@ 399 Summary: Curses library with POSIX thread support. 400 Name: ncursest6 401 Version: 6.1 402-Release: 20190907 403+Release: 20190914 404 License: X11 405 Group: Development/Libraries 406 Source: ncurses-%{version}-%{release}.tgz 407