1# ncurses 6.1 - patch 20191102 - 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-20191102.patch.gz 14# patch by Thomas E. Dickey <dickey@invisible-island.net> 15# created Sun Nov 3 01:16:28 UTC 2019 16# ------------------------------------------------------------------------------ 17# Ada95/aclocal.m4 | 22 - 18# Ada95/configure | 288 +++++++------- 19# NEWS | 9 20# VERSION | 2 21# aclocal.m4 | 20 22# configure | 558 +++++++++++++-------------- 23# dist.mk | 4 24# misc/terminfo.src | 16 25# ncurses/base/lib_getch.c | 32 - 26# ncurses/tinfo/lib_setup.c | 20 27# package/debian-mingw/changelog | 4 28# package/debian-mingw64/changelog | 4 29# package/debian/changelog | 4 30# package/mingw-ncurses.nsi | 4 31# package/mingw-ncurses.spec | 2 32# package/ncurses.spec | 2 33# package/ncursest.spec | 2 34# test/aclocal.m4 | 22 - 35# test/configure | 756 ++++++++++++++++++------------------- 36# 19 files changed, 901 insertions(+), 870 deletions(-) 37# ------------------------------------------------------------------------------ 38Index: Ada95/aclocal.m4 39Prereq: 1.146 40--- ncurses-6.1-20191026+/Ada95/aclocal.m4 2019-09-21 22:12:40.000000000 +0000 41+++ ncurses-6.1-20191102/Ada95/aclocal.m4 2019-11-02 20:56:52.000000000 +0000 42@@ -28,7 +28,7 @@ 43 dnl 44 dnl Author: Thomas E. Dickey 45 dnl 46-dnl $Id: aclocal.m4,v 1.146 2019/09/21 22:12:40 tom Exp $ 47+dnl $Id: aclocal.m4,v 1.147 2019/11/02 20:56:52 tom Exp $ 48 dnl Macros used in NCURSES Ada95 auto-configuration script. 49 dnl 50 dnl These macros are maintained separately from NCURSES. The copyright on 51@@ -288,7 +288,7 @@ 52 fi 53 ])dnl 54 dnl --------------------------------------------------------------------------- 55-dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27 56+dnl CF_ADD_LIBS version: 3 updated: 2019/11/02 16:47:33 57 dnl ----------- 58 dnl Add one or more libraries, used to enforce consistency. Libraries are 59 dnl prepended to an existing list, since their dependencies are assumed to 60@@ -297,19 +297,19 @@ 61 dnl $1 = libraries to add, with the "-l", etc. 62 dnl $2 = variable to update (default $LIBS) 63 AC_DEFUN([CF_ADD_LIBS],[ 64-cf_add_libs="$1" 65-# Filter out duplicates - this happens with badly-designed ".pc" files... 66-for cf_add_1lib in [$]ifelse($2,,LIBS,[$2]) 67-do 68- for cf_add_2lib in $cf_add_libs 69- do 70- if test "x$cf_add_1lib" = "x$cf_add_2lib" 71- then 72+cf_add_libs="[$]ifelse($2,,LIBS,[$2])" 73+# reverse order 74+cf_add_0lib= 75+for cf_add_1lib in $1; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 76+# filter duplicates 77+for cf_add_1lib in $cf_add_0lib; do 78+ for cf_add_2lib in $cf_add_libs; do 79+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 80 cf_add_1lib= 81 break 82 fi 83 done 84- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 85+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 86 done 87 ifelse($2,,LIBS,[$2])="$cf_add_libs" 88 ])dnl 89Index: Ada95/configure 90--- ncurses-6.1-20191026+/Ada95/configure 2019-09-21 22:12:48.000000000 +0000 91+++ ncurses-6.1-20191102/Ada95/configure 2019-11-02 20:57:14.000000000 +0000 92@@ -4252,19 +4252,19 @@ 93 94 fi 95 96-cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" 97-# Filter out duplicates - this happens with badly-designed ".pc" files... 98-for cf_add_1lib in $LIBS 99-do 100- for cf_add_2lib in $cf_add_libs 101- do 102- if test "x$cf_add_1lib" = "x$cf_add_2lib" 103- then 104+cf_add_libs="$LIBS" 105+# reverse order 106+cf_add_0lib= 107+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 108+# filter duplicates 109+for cf_add_1lib in $cf_add_0lib; do 110+ for cf_add_2lib in $cf_add_libs; do 111+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 112 cf_add_1lib= 113 break 114 fi 115 done 116- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 117+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 118 done 119 LIBS="$cf_add_libs" 120 121@@ -4629,19 +4629,19 @@ 122 123 fi 124 125-cf_add_libs="`$NCURSES_CONFIG --libs`" 126-# Filter out duplicates - this happens with badly-designed ".pc" files... 127-for cf_add_1lib in $LIBS 128-do 129- for cf_add_2lib in $cf_add_libs 130- do 131- if test "x$cf_add_1lib" = "x$cf_add_2lib" 132- then 133+cf_add_libs="$LIBS" 134+# reverse order 135+cf_add_0lib= 136+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 137+# filter duplicates 138+for cf_add_1lib in $cf_add_0lib; do 139+ for cf_add_2lib in $cf_add_libs; do 140+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 141 cf_add_1lib= 142 break 143 fi 144 done 145- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 146+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 147 done 148 LIBS="$cf_add_libs" 149 150@@ -5647,38 +5647,38 @@ 151 ;; 152 esac 153 154-cf_add_libs="$cf_ncurses_LIBS" 155-# Filter out duplicates - this happens with badly-designed ".pc" files... 156-for cf_add_1lib in $LIBS 157-do 158- for cf_add_2lib in $cf_add_libs 159- do 160- if test "x$cf_add_1lib" = "x$cf_add_2lib" 161- then 162+cf_add_libs="$LIBS" 163+# reverse order 164+cf_add_0lib= 165+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 166+# filter duplicates 167+for cf_add_1lib in $cf_add_0lib; do 168+ for cf_add_2lib in $cf_add_libs; do 169+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 170 cf_add_1lib= 171 break 172 fi 173 done 174- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 175+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 176 done 177 LIBS="$cf_add_libs" 178 179 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 180 then 181 182-cf_add_libs="-l$cf_nculib_root" 183-# Filter out duplicates - this happens with badly-designed ".pc" files... 184-for cf_add_1lib in $LIBS 185-do 186- for cf_add_2lib in $cf_add_libs 187- do 188- if test "x$cf_add_1lib" = "x$cf_add_2lib" 189- then 190+cf_add_libs="$LIBS" 191+# reverse order 192+cf_add_0lib= 193+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 194+# filter duplicates 195+for cf_add_1lib in $cf_add_0lib; do 196+ for cf_add_2lib in $cf_add_libs; do 197+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 198 cf_add_1lib= 199 break 200 fi 201 done 202- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 203+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 204 done 205 LIBS="$cf_add_libs" 206 207@@ -6516,19 +6516,19 @@ 208 done 209 fi 210 211-cf_add_libs="$cf_cv_library_file_utf8" 212-# Filter out duplicates - this happens with badly-designed ".pc" files... 213-for cf_add_1lib in $LIBS 214-do 215- for cf_add_2lib in $cf_add_libs 216- do 217- if test "x$cf_add_1lib" = "x$cf_add_2lib" 218- then 219+cf_add_libs="$LIBS" 220+# reverse order 221+cf_add_0lib= 222+for cf_add_1lib in $cf_cv_library_file_utf8; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 223+# filter duplicates 224+for cf_add_1lib in $cf_add_0lib; do 225+ for cf_add_2lib in $cf_add_libs; do 226+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 227 cf_add_1lib= 228 break 229 fi 230 done 231- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 232+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 233 done 234 LIBS="$cf_add_libs" 235 236@@ -6649,19 +6649,19 @@ 237 238 fi 239 240-cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" 241-# Filter out duplicates - this happens with badly-designed ".pc" files... 242-for cf_add_1lib in $LIBS 243-do 244- for cf_add_2lib in $cf_add_libs 245- do 246- if test "x$cf_add_1lib" = "x$cf_add_2lib" 247- then 248+cf_add_libs="$LIBS" 249+# reverse order 250+cf_add_0lib= 251+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 252+# filter duplicates 253+for cf_add_1lib in $cf_add_0lib; do 254+ for cf_add_2lib in $cf_add_libs; do 255+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 256 cf_add_1lib= 257 break 258 fi 259 done 260- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 261+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 262 done 263 LIBS="$cf_add_libs" 264 265@@ -7026,19 +7026,19 @@ 266 267 fi 268 269-cf_add_libs="`$NCURSES_CONFIG --libs`" 270-# Filter out duplicates - this happens with badly-designed ".pc" files... 271-for cf_add_1lib in $LIBS 272-do 273- for cf_add_2lib in $cf_add_libs 274- do 275- if test "x$cf_add_1lib" = "x$cf_add_2lib" 276- then 277+cf_add_libs="$LIBS" 278+# reverse order 279+cf_add_0lib= 280+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 281+# filter duplicates 282+for cf_add_1lib in $cf_add_0lib; do 283+ for cf_add_2lib in $cf_add_libs; do 284+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 285 cf_add_1lib= 286 break 287 fi 288 done 289- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 290+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 291 done 292 LIBS="$cf_add_libs" 293 294@@ -8052,38 +8052,38 @@ 295 ;; 296 esac 297 298-cf_add_libs="$cf_ncurses_LIBS" 299-# Filter out duplicates - this happens with badly-designed ".pc" files... 300-for cf_add_1lib in $LIBS 301-do 302- for cf_add_2lib in $cf_add_libs 303- do 304- if test "x$cf_add_1lib" = "x$cf_add_2lib" 305- then 306+cf_add_libs="$LIBS" 307+# reverse order 308+cf_add_0lib= 309+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 310+# filter duplicates 311+for cf_add_1lib in $cf_add_0lib; do 312+ for cf_add_2lib in $cf_add_libs; do 313+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 314 cf_add_1lib= 315 break 316 fi 317 done 318- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 319+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 320 done 321 LIBS="$cf_add_libs" 322 323 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 324 then 325 326-cf_add_libs="-l$cf_nculib_root" 327-# Filter out duplicates - this happens with badly-designed ".pc" files... 328-for cf_add_1lib in $LIBS 329-do 330- for cf_add_2lib in $cf_add_libs 331- do 332- if test "x$cf_add_1lib" = "x$cf_add_2lib" 333- then 334+cf_add_libs="$LIBS" 335+# reverse order 336+cf_add_0lib= 337+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 338+# filter duplicates 339+for cf_add_1lib in $cf_add_0lib; do 340+ for cf_add_2lib in $cf_add_libs; do 341+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 342 cf_add_1lib= 343 break 344 fi 345 done 346- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 347+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 348 done 349 LIBS="$cf_add_libs" 350 351@@ -8486,19 +8486,19 @@ 352 353 fi 354 355-cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" 356-# Filter out duplicates - this happens with badly-designed ".pc" files... 357-for cf_add_1lib in $LIBS 358-do 359- for cf_add_2lib in $cf_add_libs 360- do 361- if test "x$cf_add_1lib" = "x$cf_add_2lib" 362- then 363+cf_add_libs="$LIBS" 364+# reverse order 365+cf_add_0lib= 366+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 367+# filter duplicates 368+for cf_add_1lib in $cf_add_0lib; do 369+ for cf_add_2lib in $cf_add_libs; do 370+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 371 cf_add_1lib= 372 break 373 fi 374 done 375- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 376+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 377 done 378 LIBS="$cf_add_libs" 379 380@@ -8863,19 +8863,19 @@ 381 382 fi 383 384-cf_add_libs="`$NCURSES_CONFIG --libs`" 385-# Filter out duplicates - this happens with badly-designed ".pc" files... 386-for cf_add_1lib in $LIBS 387-do 388- for cf_add_2lib in $cf_add_libs 389- do 390- if test "x$cf_add_1lib" = "x$cf_add_2lib" 391- then 392+cf_add_libs="$LIBS" 393+# reverse order 394+cf_add_0lib= 395+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 396+# filter duplicates 397+for cf_add_1lib in $cf_add_0lib; do 398+ for cf_add_2lib in $cf_add_libs; do 399+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 400 cf_add_1lib= 401 break 402 fi 403 done 404- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 405+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 406 done 407 LIBS="$cf_add_libs" 408 409@@ -9881,38 +9881,38 @@ 410 ;; 411 esac 412 413-cf_add_libs="$cf_ncurses_LIBS" 414-# Filter out duplicates - this happens with badly-designed ".pc" files... 415-for cf_add_1lib in $LIBS 416-do 417- for cf_add_2lib in $cf_add_libs 418- do 419- if test "x$cf_add_1lib" = "x$cf_add_2lib" 420- then 421+cf_add_libs="$LIBS" 422+# reverse order 423+cf_add_0lib= 424+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 425+# filter duplicates 426+for cf_add_1lib in $cf_add_0lib; do 427+ for cf_add_2lib in $cf_add_libs; do 428+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 429 cf_add_1lib= 430 break 431 fi 432 done 433- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 434+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 435 done 436 LIBS="$cf_add_libs" 437 438 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 439 then 440 441-cf_add_libs="-l$cf_nculib_root" 442-# Filter out duplicates - this happens with badly-designed ".pc" files... 443-for cf_add_1lib in $LIBS 444-do 445- for cf_add_2lib in $cf_add_libs 446- do 447- if test "x$cf_add_1lib" = "x$cf_add_2lib" 448- then 449+cf_add_libs="$LIBS" 450+# reverse order 451+cf_add_0lib= 452+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 453+# filter duplicates 454+for cf_add_1lib in $cf_add_0lib; do 455+ for cf_add_2lib in $cf_add_libs; do 456+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 457 cf_add_1lib= 458 break 459 fi 460 done 461- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 462+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 463 done 464 LIBS="$cf_add_libs" 465 466@@ -10356,19 +10356,19 @@ 467 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 468 cf_save_LIBS="$LIBS" 469 470-cf_add_libs="${LD_RPATH_OPT}$libdir" 471-# Filter out duplicates - this happens with badly-designed ".pc" files... 472-for cf_add_1lib in $LIBS 473-do 474- for cf_add_2lib in $cf_add_libs 475- do 476- if test "x$cf_add_1lib" = "x$cf_add_2lib" 477- then 478+cf_add_libs="$LIBS" 479+# reverse order 480+cf_add_0lib= 481+for cf_add_1lib in ${LD_RPATH_OPT}$libdir; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 482+# filter duplicates 483+for cf_add_1lib in $cf_add_0lib; do 484+ for cf_add_2lib in $cf_add_libs; do 485+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 486 cf_add_1lib= 487 break 488 fi 489 done 490- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 491+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 492 done 493 LIBS="$cf_add_libs" 494 495@@ -13453,19 +13453,19 @@ 496 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 497 cf_save_LIBS="$LIBS" 498 499-cf_add_libs="-l$cf_lib_pthread" 500-# Filter out duplicates - this happens with badly-designed ".pc" files... 501-for cf_add_1lib in $LIBS 502-do 503- for cf_add_2lib in $cf_add_libs 504- do 505- if test "x$cf_add_1lib" = "x$cf_add_2lib" 506- then 507+cf_add_libs="$LIBS" 508+# reverse order 509+cf_add_0lib= 510+for cf_add_1lib in -l$cf_lib_pthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 511+# filter duplicates 512+for cf_add_1lib in $cf_add_0lib; do 513+ for cf_add_2lib in $cf_add_libs; do 514+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 515 cf_add_1lib= 516 break 517 fi 518 done 519- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 520+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 521 done 522 LIBS="$cf_add_libs" 523 524@@ -13513,19 +13513,19 @@ 525 526 if test "$with_pthread" = yes ; then 527 528-cf_add_libs="-l$cf_lib_pthread" 529-# Filter out duplicates - this happens with badly-designed ".pc" files... 530-for cf_add_1lib in $LIBS 531-do 532- for cf_add_2lib in $cf_add_libs 533- do 534- if test "x$cf_add_1lib" = "x$cf_add_2lib" 535- then 536+cf_add_libs="$LIBS" 537+# reverse order 538+cf_add_0lib= 539+for cf_add_1lib in -l$cf_lib_pthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 540+# filter duplicates 541+for cf_add_1lib in $cf_add_0lib; do 542+ for cf_add_2lib in $cf_add_libs; do 543+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 544 cf_add_1lib= 545 break 546 fi 547 done 548- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 549+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 550 done 551 LIBS="$cf_add_libs" 552 553Index: NEWS 554Prereq: 1.3399 555--- ncurses-6.1-20191026+/NEWS 2019-10-27 00:10:51.000000000 +0000 556+++ ncurses-6.1-20191102/NEWS 2019-11-03 00:12:08.000000000 +0000 557@@ -25,7 +25,7 @@ 558 -- sale, use or other dealings in this Software without prior written -- 559 -- authorization. -- 560 ------------------------------------------------------------------------------- 561--- $Id: NEWS,v 1.3399 2019/10/27 00:10:51 tom Exp $ 562+-- $Id: NEWS,v 1.3401 2019/11/03 00:12:08 tom Exp $ 563 ------------------------------------------------------------------------------- 564 565 This is a log of changes that ncurses has gone through since Zeyd started 566@@ -45,6 +45,13 @@ 567 Changes through 1.9.9e did not credit all contributions; 568 it is not possible to add this information. 569 570+20191102 571+ + check parameter of set_escdelay, return ERR if negative. 572+ + check parameter of set_tabsize, return ERR if not greater than zero 573+ (report/patch by Anthony Sottile). 574+ + revise CF_ADD_LIBS macro to prepend rather than append libraries. 575+ + add "xterm-mono" to help packagers (report by Sven Joachim) -TD 576+ 577 20191026 578 + add a note in man/curs_add_wch.3x about Unicode terminology for the 579 line-drawing characters (report by Nick Black). 580Index: VERSION 581--- ncurses-6.1-20191026+/VERSION 2019-10-26 08:56:47.000000000 +0000 582+++ ncurses-6.1-20191102/VERSION 2019-11-02 09:43:29.000000000 +0000 583@@ -1 +1 @@ 584-5:0:10 6.1 20191026 585+5:0:10 6.1 20191102 586Index: aclocal.m4 587Prereq: 1.884 588--- ncurses-6.1-20191026+/aclocal.m4 2019-09-27 21:08:36.000000000 +0000 589+++ ncurses-6.1-20191102/aclocal.m4 2019-11-02 20:32:27.000000000 +0000 590@@ -28,7 +28,7 @@ 591 dnl 592 dnl Author: Thomas E. Dickey 1995-on 593 dnl 594-dnl $Id: aclocal.m4,v 1.884 2019/09/27 21:08:36 tom Exp $ 595+dnl $Id: aclocal.m4,v 1.885 2019/11/02 20:32:27 tom Exp $ 596 dnl Macros used in NCURSES auto-configuration script. 597 dnl 598 dnl These macros are maintained separately from NCURSES. The copyright on 599@@ -355,19 +355,19 @@ 600 dnl $1 = libraries to add, with the "-l", etc. 601 dnl $2 = variable to update (default $LIBS) 602 AC_DEFUN([CF_ADD_LIBS],[ 603-cf_add_libs="$1" 604-# Filter out duplicates - this happens with badly-designed ".pc" files... 605-for cf_add_1lib in [$]ifelse($2,,LIBS,[$2]) 606-do 607- for cf_add_2lib in $cf_add_libs 608- do 609- if test "x$cf_add_1lib" = "x$cf_add_2lib" 610- then 611+cf_add_libs="[$]ifelse($2,,LIBS,[$2])" 612+# reverse order 613+cf_add_0lib= 614+for cf_add_1lib in $1; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 615+# filter duplicates 616+for cf_add_1lib in $cf_add_0lib; do 617+ for cf_add_2lib in $cf_add_libs; do 618+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 619 cf_add_1lib= 620 break 621 fi 622 done 623- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 624+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 625 done 626 ifelse($2,,LIBS,[$2])="$cf_add_libs" 627 ])dnl 628Index: configure 629--- ncurses-6.1-20191026+/configure 2019-09-27 22:50:51.000000000 +0000 630+++ ncurses-6.1-20191102/configure 2019-11-02 20:33:48.000000000 +0000 631@@ -5619,19 +5619,19 @@ 632 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 633 cf_save_LIBS="$LIBS" 634 635-cf_add_libs="${LD_RPATH_OPT}$libdir" 636-# Filter out duplicates - this happens with badly-designed ".pc" files... 637-for cf_add_1lib in $LIBS 638-do 639- for cf_add_2lib in $cf_add_libs 640- do 641- if test "x$cf_add_1lib" = "x$cf_add_2lib" 642- then 643+cf_add_libs="$LIBS" 644+# reverse order 645+cf_add_0lib= 646+for cf_add_1lib in ${LD_RPATH_OPT}$libdir; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 647+# filter duplicates 648+for cf_add_1lib in $cf_add_0lib; do 649+ for cf_add_2lib in $cf_add_libs; do 650+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 651 cf_add_1lib= 652 break 653 fi 654 done 655- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 656+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 657 done 658 LIBS="$cf_add_libs" 659 660@@ -6757,19 +6757,19 @@ 661 662 if test "$cf_have_dlsym" = yes ; then 663 test "$cf_have_libdl" = yes && { 664-cf_add_libs="-ldl" 665-# Filter out duplicates - this happens with badly-designed ".pc" files... 666-for cf_add_1lib in $LIBS 667-do 668- for cf_add_2lib in $cf_add_libs 669- do 670- if test "x$cf_add_1lib" = "x$cf_add_2lib" 671- then 672+cf_add_libs="$LIBS" 673+# reverse order 674+cf_add_0lib= 675+for cf_add_1lib in -ldl; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 676+# filter duplicates 677+for cf_add_1lib in $cf_add_0lib; do 678+ for cf_add_2lib in $cf_add_libs; do 679+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 680 cf_add_1lib= 681 break 682 fi 683 done 684- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 685+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 686 done 687 LIBS="$cf_add_libs" 688 } 689@@ -6854,19 +6854,19 @@ 690 CF_EOF 691 cf_save_LIBS="$LIBS" 692 693-cf_add_libs="-lgpm" 694-# Filter out duplicates - this happens with badly-designed ".pc" files... 695-for cf_add_1lib in $LIBS 696-do 697- for cf_add_2lib in $cf_add_libs 698- do 699- if test "x$cf_add_1lib" = "x$cf_add_2lib" 700- then 701+cf_add_libs="$LIBS" 702+# reverse order 703+cf_add_0lib= 704+for cf_add_1lib in -lgpm; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 705+# filter duplicates 706+for cf_add_1lib in $cf_add_0lib; do 707+ for cf_add_2lib in $cf_add_libs; do 708+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 709 cf_add_1lib= 710 break 711 fi 712 done 713- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 714+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 715 done 716 LIBS="$cf_add_libs" 717 718@@ -6900,54 +6900,54 @@ 719 720 SHLIB_LIST="-ldl $SHLIB_LIST" 721 722-cf_add_libs="-ldl" 723-# Filter out duplicates - this happens with badly-designed ".pc" files... 724-for cf_add_1lib in $PRIVATE_LIBS 725-do 726- for cf_add_2lib in $cf_add_libs 727- do 728- if test "x$cf_add_1lib" = "x$cf_add_2lib" 729- then 730+cf_add_libs="$PRIVATE_LIBS" 731+# reverse order 732+cf_add_0lib= 733+for cf_add_1lib in -ldl; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 734+# filter duplicates 735+for cf_add_1lib in $cf_add_0lib; do 736+ for cf_add_2lib in $cf_add_libs; do 737+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 738 cf_add_1lib= 739 break 740 fi 741 done 742- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 743+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 744 done 745 PRIVATE_LIBS="$cf_add_libs" 746 747 else 748 SHLIB_LIST="-lgpm $SHLIB_LIST" 749 750-cf_add_libs="-lgpm" 751-# Filter out duplicates - this happens with badly-designed ".pc" files... 752-for cf_add_1lib in $TEST_LIBS 753-do 754- for cf_add_2lib in $cf_add_libs 755- do 756- if test "x$cf_add_1lib" = "x$cf_add_2lib" 757- then 758+cf_add_libs="$TEST_LIBS" 759+# reverse order 760+cf_add_0lib= 761+for cf_add_1lib in -lgpm; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 762+# filter duplicates 763+for cf_add_1lib in $cf_add_0lib; do 764+ for cf_add_2lib in $cf_add_libs; do 765+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 766 cf_add_1lib= 767 break 768 fi 769 done 770- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 771+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 772 done 773 TEST_LIBS="$cf_add_libs" 774 775-cf_add_libs="-lgpm" 776-# Filter out duplicates - this happens with badly-designed ".pc" files... 777-for cf_add_1lib in $PRIVATE_LIBS 778-do 779- for cf_add_2lib in $cf_add_libs 780- do 781- if test "x$cf_add_1lib" = "x$cf_add_2lib" 782- then 783+cf_add_libs="$PRIVATE_LIBS" 784+# reverse order 785+cf_add_0lib= 786+for cf_add_1lib in -lgpm; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 787+# filter duplicates 788+for cf_add_1lib in $cf_add_0lib; do 789+ for cf_add_2lib in $cf_add_libs; do 790+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 791 cf_add_1lib= 792 break 793 fi 794 done 795- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 796+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 797 done 798 PRIVATE_LIBS="$cf_add_libs" 799 800@@ -7191,19 +7191,19 @@ 801 802 fi 803 804-cf_add_libs="$cf_pkgconfig_libs" 805-# Filter out duplicates - this happens with badly-designed ".pc" files... 806-for cf_add_1lib in $LIBS 807-do 808- for cf_add_2lib in $cf_add_libs 809- do 810- if test "x$cf_add_1lib" = "x$cf_add_2lib" 811- then 812+cf_add_libs="$LIBS" 813+# reverse order 814+cf_add_0lib= 815+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 816+# filter duplicates 817+for cf_add_1lib in $cf_add_0lib; do 818+ for cf_add_2lib in $cf_add_libs; do 819+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 820 cf_add_1lib= 821 break 822 fi 823 done 824- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 825+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 826 done 827 LIBS="$cf_add_libs" 828 829@@ -7325,19 +7325,19 @@ 830 831 fi 832 833-cf_add_libs="$cf_pkgconfig_libs" 834-# Filter out duplicates - this happens with badly-designed ".pc" files... 835-for cf_add_1lib in $LIBS 836-do 837- for cf_add_2lib in $cf_add_libs 838- do 839- if test "x$cf_add_1lib" = "x$cf_add_2lib" 840- then 841+cf_add_libs="$LIBS" 842+# reverse order 843+cf_add_0lib= 844+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 845+# filter duplicates 846+for cf_add_1lib in $cf_add_0lib; do 847+ for cf_add_2lib in $cf_add_libs; do 848+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 849 cf_add_1lib= 850 break 851 fi 852 done 853- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 854+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 855 done 856 LIBS="$cf_add_libs" 857 858@@ -7413,19 +7413,19 @@ 859 echo "${ECHO_T}$ac_cv_lib_pcre2_posix_regcomp" >&6 860 if test $ac_cv_lib_pcre2_posix_regcomp = yes; then 861 862-cf_add_libs="-lpcre2-posix" 863-# Filter out duplicates - this happens with badly-designed ".pc" files... 864-for cf_add_1lib in $LIBS 865-do 866- for cf_add_2lib in $cf_add_libs 867- do 868- if test "x$cf_add_1lib" = "x$cf_add_2lib" 869- then 870+cf_add_libs="$LIBS" 871+# reverse order 872+cf_add_0lib= 873+for cf_add_1lib in -lpcre2-posix; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 874+# filter duplicates 875+for cf_add_1lib in $cf_add_0lib; do 876+ for cf_add_2lib in $cf_add_libs; do 877+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 878 cf_add_1lib= 879 break 880 fi 881 done 882- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 883+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 884 done 885 LIBS="$cf_add_libs" 886 887@@ -7481,19 +7481,19 @@ 888 echo "${ECHO_T}$ac_cv_lib_pcreposix_regcomp" >&6 889 if test $ac_cv_lib_pcreposix_regcomp = yes; then 890 891-cf_add_libs="-lpcreposix" 892-# Filter out duplicates - this happens with badly-designed ".pc" files... 893-for cf_add_1lib in $LIBS 894-do 895- for cf_add_2lib in $cf_add_libs 896- do 897- if test "x$cf_add_1lib" = "x$cf_add_2lib" 898- then 899+cf_add_libs="$LIBS" 900+# reverse order 901+cf_add_0lib= 902+for cf_add_1lib in -lpcreposix; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 903+# filter duplicates 904+for cf_add_1lib in $cf_add_0lib; do 905+ for cf_add_2lib in $cf_add_libs; do 906+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 907 cf_add_1lib= 908 break 909 fi 910 done 911- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 912+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 913 done 914 LIBS="$cf_add_libs" 915 916@@ -12151,19 +12151,19 @@ 917 done 918 fi 919 920-cf_add_libs="$cf_cv_library_file_utf8" 921-# Filter out duplicates - this happens with badly-designed ".pc" files... 922-for cf_add_1lib in $LIBS 923-do 924- for cf_add_2lib in $cf_add_libs 925- do 926- if test "x$cf_add_1lib" = "x$cf_add_2lib" 927- then 928+cf_add_libs="$LIBS" 929+# reverse order 930+cf_add_0lib= 931+for cf_add_1lib in $cf_cv_library_file_utf8; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 932+# filter duplicates 933+for cf_add_1lib in $cf_add_0lib; do 934+ for cf_add_2lib in $cf_add_libs; do 935+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 936 cf_add_1lib= 937 break 938 fi 939 done 940- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 941+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 942 done 943 LIBS="$cf_add_libs" 944 945@@ -14612,19 +14612,19 @@ 946 echo $ECHO_N "checking if we can link with the $cf_lib_pthread library... $ECHO_C" >&6 947 cf_save_LIBS="$LIBS" 948 949-cf_add_libs="-l$cf_lib_pthread" 950-# Filter out duplicates - this happens with badly-designed ".pc" files... 951-for cf_add_1lib in $LIBS 952-do 953- for cf_add_2lib in $cf_add_libs 954- do 955- if test "x$cf_add_1lib" = "x$cf_add_2lib" 956- then 957+cf_add_libs="$LIBS" 958+# reverse order 959+cf_add_0lib= 960+for cf_add_1lib in -l$cf_lib_pthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 961+# filter duplicates 962+for cf_add_1lib in $cf_add_0lib; do 963+ for cf_add_2lib in $cf_add_libs; do 964+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 965 cf_add_1lib= 966 break 967 fi 968 done 969- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 970+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 971 done 972 LIBS="$cf_add_libs" 973 974@@ -14672,19 +14672,19 @@ 975 976 if test "$with_pthread" = yes ; then 977 978-cf_add_libs="-l$cf_lib_pthread" 979-# Filter out duplicates - this happens with badly-designed ".pc" files... 980-for cf_add_1lib in $LIBS 981-do 982- for cf_add_2lib in $cf_add_libs 983- do 984- if test "x$cf_add_1lib" = "x$cf_add_2lib" 985- then 986+cf_add_libs="$LIBS" 987+# reverse order 988+cf_add_0lib= 989+for cf_add_1lib in -l$cf_lib_pthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 990+# filter duplicates 991+for cf_add_1lib in $cf_add_0lib; do 992+ for cf_add_2lib in $cf_add_libs; do 993+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 994 cf_add_1lib= 995 break 996 fi 997 done 998- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 999+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1000 done 1001 LIBS="$cf_add_libs" 1002 1003@@ -14878,19 +14878,19 @@ 1004 if test "x$cf_cv_weak_symbols" = xyes ; then 1005 PTHREAD=-lpthread 1006 1007-cf_add_libs="-lpthread" 1008-# Filter out duplicates - this happens with badly-designed ".pc" files... 1009-for cf_add_1lib in $PRIVATE_LIBS 1010-do 1011- for cf_add_2lib in $cf_add_libs 1012- do 1013- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1014- then 1015+cf_add_libs="$PRIVATE_LIBS" 1016+# reverse order 1017+cf_add_0lib= 1018+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1019+# filter duplicates 1020+for cf_add_1lib in $cf_add_0lib; do 1021+ for cf_add_2lib in $cf_add_libs; do 1022+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1023 cf_add_1lib= 1024 break 1025 fi 1026 done 1027- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1028+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1029 done 1030 PRIVATE_LIBS="$cf_add_libs" 1031 1032@@ -14922,51 +14922,51 @@ 1033 # remove pthread library from $LIBS 1034 LIBS=`echo "$LIBS" | sed -e 's/-lpthread[ ]//g' -e 's/-lpthread$//'` 1035 1036-cf_add_libs="-lpthread" 1037-# Filter out duplicates - this happens with badly-designed ".pc" files... 1038-for cf_add_1lib in $TEST_LIBS 1039-do 1040- for cf_add_2lib in $cf_add_libs 1041- do 1042- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1043- then 1044+cf_add_libs="$TEST_LIBS" 1045+# reverse order 1046+cf_add_0lib= 1047+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1048+# filter duplicates 1049+for cf_add_1lib in $cf_add_0lib; do 1050+ for cf_add_2lib in $cf_add_libs; do 1051+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1052 cf_add_1lib= 1053 break 1054 fi 1055 done 1056- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1057+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1058 done 1059 TEST_LIBS="$cf_add_libs" 1060 1061-cf_add_libs="-lpthread" 1062-# Filter out duplicates - this happens with badly-designed ".pc" files... 1063-for cf_add_1lib in $TEST_LIBS2 1064-do 1065- for cf_add_2lib in $cf_add_libs 1066- do 1067- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1068- then 1069+cf_add_libs="$TEST_LIBS2" 1070+# reverse order 1071+cf_add_0lib= 1072+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1073+# filter duplicates 1074+for cf_add_1lib in $cf_add_0lib; do 1075+ for cf_add_2lib in $cf_add_libs; do 1076+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1077 cf_add_1lib= 1078 break 1079 fi 1080 done 1081- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1082+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1083 done 1084 TEST_LIBS2="$cf_add_libs" 1085 1086-cf_add_libs="-lpthread" 1087-# Filter out duplicates - this happens with badly-designed ".pc" files... 1088-for cf_add_1lib in $PRIVATE_LIBS 1089-do 1090- for cf_add_2lib in $cf_add_libs 1091- do 1092- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1093- then 1094+cf_add_libs="$PRIVATE_LIBS" 1095+# reverse order 1096+cf_add_0lib= 1097+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1098+# filter duplicates 1099+for cf_add_1lib in $cf_add_0lib; do 1100+ for cf_add_2lib in $cf_add_libs; do 1101+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1102 cf_add_1lib= 1103 break 1104 fi 1105 done 1106- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1107+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1108 done 1109 PRIVATE_LIBS="$cf_add_libs" 1110 1111@@ -16145,19 +16145,19 @@ 1112 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 1113 if test $ac_cv_lib_bsd_strlcat = yes; then 1114 1115-cf_add_libs="-lbsd" 1116-# Filter out duplicates - this happens with badly-designed ".pc" files... 1117-for cf_add_1lib in $LIBS 1118-do 1119- for cf_add_2lib in $cf_add_libs 1120- do 1121- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1122- then 1123+cf_add_libs="$LIBS" 1124+# reverse order 1125+cf_add_0lib= 1126+for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1127+# filter duplicates 1128+for cf_add_1lib in $cf_add_0lib; do 1129+ for cf_add_2lib in $cf_add_libs; do 1130+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1131 cf_add_1lib= 1132 break 1133 fi 1134 done 1135- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1136+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1137 done 1138 LIBS="$cf_add_libs" 1139 1140@@ -17243,19 +17243,19 @@ 1141 #define HAVE_GETTIMEOFDAY 1 1142 EOF 1143 1144-cf_add_libs="-lbsd" 1145-# Filter out duplicates - this happens with badly-designed ".pc" files... 1146-for cf_add_1lib in $LIBS 1147-do 1148- for cf_add_2lib in $cf_add_libs 1149- do 1150- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1151- then 1152+cf_add_libs="$LIBS" 1153+# reverse order 1154+cf_add_0lib= 1155+for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1156+# filter duplicates 1157+for cf_add_1lib in $cf_add_0lib; do 1158+ for cf_add_2lib in $cf_add_libs; do 1159+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1160 cf_add_1lib= 1161 break 1162 fi 1163 done 1164- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1165+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1166 done 1167 LIBS="$cf_add_libs" 1168 1169@@ -17794,19 +17794,19 @@ 1170 echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 1171 if test `eval echo '${'$as_ac_Lib'}'` = yes; then 1172 1173-cf_add_libs="-l$cf_regex_lib" 1174-# Filter out duplicates - this happens with badly-designed ".pc" files... 1175-for cf_add_1lib in $LIBS 1176-do 1177- for cf_add_2lib in $cf_add_libs 1178- do 1179- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1180- then 1181+cf_add_libs="$LIBS" 1182+# reverse order 1183+cf_add_0lib= 1184+for cf_add_1lib in -l$cf_regex_lib; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1185+# filter duplicates 1186+for cf_add_1lib in $cf_add_0lib; do 1187+ for cf_add_2lib in $cf_add_libs; do 1188+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1189 cf_add_1lib= 1190 break 1191 fi 1192 done 1193- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1194+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1195 done 1196 LIBS="$cf_add_libs" 1197 1198@@ -17932,19 +17932,19 @@ 1199 echo "${ECHO_T}$ac_cv_lib_gen_compile" >&6 1200 if test $ac_cv_lib_gen_compile = yes; then 1201 1202-cf_add_libs="-lgen" 1203-# Filter out duplicates - this happens with badly-designed ".pc" files... 1204-for cf_add_1lib in $LIBS 1205-do 1206- for cf_add_2lib in $cf_add_libs 1207- do 1208- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1209- then 1210+cf_add_libs="$LIBS" 1211+# reverse order 1212+cf_add_0lib= 1213+for cf_add_1lib in -lgen; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1214+# filter duplicates 1215+for cf_add_1lib in $cf_add_0lib; do 1216+ for cf_add_2lib in $cf_add_libs; do 1217+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1218 cf_add_1lib= 1219 break 1220 fi 1221 done 1222- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1223+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1224 done 1225 LIBS="$cf_add_libs" 1226 1227@@ -18759,19 +18759,19 @@ 1228 echo "${ECHO_T}$ac_cv_lib_inet_bzero" >&6 1229 if test $ac_cv_lib_inet_bzero = yes; then 1230 1231-cf_add_libs="-linet" 1232-# Filter out duplicates - this happens with badly-designed ".pc" files... 1233-for cf_add_1lib in $LIBS 1234-do 1235- for cf_add_2lib in $cf_add_libs 1236- do 1237- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1238- then 1239+cf_add_libs="$LIBS" 1240+# reverse order 1241+cf_add_0lib= 1242+for cf_add_1lib in -linet; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1243+# filter duplicates 1244+for cf_add_1lib in $cf_add_0lib; do 1245+ for cf_add_2lib in $cf_add_libs; do 1246+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1247 cf_add_1lib= 1248 break 1249 fi 1250 done 1251- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1252+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1253 done 1254 LIBS="$cf_add_libs" 1255 1256@@ -22011,19 +22011,19 @@ 1257 1258 cf_save_LIBS="$LIBS" 1259 test $cf_cv_lib_util = yes && { 1260-cf_add_libs="-lutil" 1261-# Filter out duplicates - this happens with badly-designed ".pc" files... 1262-for cf_add_1lib in $LIBS 1263-do 1264- for cf_add_2lib in $cf_add_libs 1265- do 1266- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1267- then 1268+cf_add_libs="$LIBS" 1269+# reverse order 1270+cf_add_0lib= 1271+for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1272+# filter duplicates 1273+for cf_add_1lib in $cf_add_0lib; do 1274+ for cf_add_2lib in $cf_add_libs; do 1275+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1276 cf_add_1lib= 1277 break 1278 fi 1279 done 1280- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1281+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1282 done 1283 LIBS="$cf_add_libs" 1284 } 1285@@ -22089,19 +22089,19 @@ 1286 1287 if test "x$cf_cv_lib_util" = xyes ; then 1288 1289-cf_add_libs="-lutil" 1290-# Filter out duplicates - this happens with badly-designed ".pc" files... 1291-for cf_add_1lib in $TEST_LIBS 1292-do 1293- for cf_add_2lib in $cf_add_libs 1294- do 1295- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1296- then 1297+cf_add_libs="$TEST_LIBS" 1298+# reverse order 1299+cf_add_0lib= 1300+for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1301+# filter duplicates 1302+for cf_add_1lib in $cf_add_0lib; do 1303+ for cf_add_2lib in $cf_add_libs; do 1304+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1305 cf_add_1lib= 1306 break 1307 fi 1308 done 1309- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1310+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1311 done 1312 TEST_LIBS="$cf_add_libs" 1313 1314@@ -22566,19 +22566,19 @@ 1315 cf_save_libs="$LIBS" 1316 if test -n "$cf_db_libs"; then 1317 1318-cf_add_libs="-l$cf_db_libs" 1319-# Filter out duplicates - this happens with badly-designed ".pc" files... 1320-for cf_add_1lib in $LIBS 1321-do 1322- for cf_add_2lib in $cf_add_libs 1323- do 1324- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1325- then 1326+cf_add_libs="$LIBS" 1327+# reverse order 1328+cf_add_0lib= 1329+for cf_add_1lib in -l$cf_db_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1330+# filter duplicates 1331+for cf_add_1lib in $cf_add_0lib; do 1332+ for cf_add_2lib in $cf_add_libs; do 1333+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1334 cf_add_1lib= 1335 break 1336 fi 1337 done 1338- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1339+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1340 done 1341 LIBS="$cf_add_libs" 1342 1343@@ -22680,19 +22680,19 @@ 1344 { (exit 1); exit 1; }; } 1345 elif test "$cf_cv_hashed_db_libs" != default ; then 1346 1347-cf_add_libs="-l$cf_cv_hashed_db_libs" 1348-# Filter out duplicates - this happens with badly-designed ".pc" files... 1349-for cf_add_1lib in $LIBS 1350-do 1351- for cf_add_2lib in $cf_add_libs 1352- do 1353- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1354- then 1355+cf_add_libs="$LIBS" 1356+# reverse order 1357+cf_add_0lib= 1358+for cf_add_1lib in -l$cf_cv_hashed_db_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1359+# filter duplicates 1360+for cf_add_1lib in $cf_add_0lib; do 1361+ for cf_add_2lib in $cf_add_libs; do 1362+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1363 cf_add_1lib= 1364 break 1365 fi 1366 done 1367- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1368+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1369 done 1370 LIBS="$cf_add_libs" 1371 1372@@ -22924,19 +22924,19 @@ 1373 cf_save="$LIBS" 1374 LIBS="$LIBS $CXXLIBS" 1375 1376-cf_add_libs="-l$cf_stdcpp_libname" 1377-# Filter out duplicates - this happens with badly-designed ".pc" files... 1378-for cf_add_1lib in $LIBS 1379-do 1380- for cf_add_2lib in $cf_add_libs 1381- do 1382- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1383- then 1384+cf_add_libs="$LIBS" 1385+# reverse order 1386+cf_add_0lib= 1387+for cf_add_1lib in -l$cf_stdcpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1388+# filter duplicates 1389+for cf_add_1lib in $cf_add_0lib; do 1390+ for cf_add_2lib in $cf_add_libs; do 1391+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1392 cf_add_1lib= 1393 break 1394 fi 1395 done 1396- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1397+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1398 done 1399 LIBS="$cf_add_libs" 1400 1401@@ -22979,19 +22979,19 @@ 1402 echo "$as_me:22979: result: $cf_cv_libstdcpp" >&5 1403 echo "${ECHO_T}$cf_cv_libstdcpp" >&6 1404 test "$cf_cv_libstdcpp" = yes && { 1405-cf_add_libs="-l$cf_stdcpp_libname" 1406-# Filter out duplicates - this happens with badly-designed ".pc" files... 1407-for cf_add_1lib in $CXXLIBS 1408-do 1409- for cf_add_2lib in $cf_add_libs 1410- do 1411- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1412- then 1413+cf_add_libs="$CXXLIBS" 1414+# reverse order 1415+cf_add_0lib= 1416+for cf_add_1lib in -l$cf_stdcpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1417+# filter duplicates 1418+for cf_add_1lib in $cf_add_0lib; do 1419+ for cf_add_2lib in $cf_add_libs; do 1420+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1421 cf_add_1lib= 1422 break 1423 fi 1424 done 1425- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1426+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1427 done 1428 CXXLIBS="$cf_add_libs" 1429 } 1430@@ -23059,19 +23059,19 @@ 1431 echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6 1432 cf_save="$LIBS" 1433 1434-cf_add_libs="-l$cf_gpp_libname" 1435-# Filter out duplicates - this happens with badly-designed ".pc" files... 1436-for cf_add_1lib in $LIBS 1437-do 1438- for cf_add_2lib in $cf_add_libs 1439- do 1440- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1441- then 1442+cf_add_libs="$LIBS" 1443+# reverse order 1444+cf_add_0lib= 1445+for cf_add_1lib in -l$cf_gpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1446+# filter duplicates 1447+for cf_add_1lib in $cf_add_0lib; do 1448+ for cf_add_2lib in $cf_add_libs; do 1449+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1450 cf_add_1lib= 1451 break 1452 fi 1453 done 1454- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1455+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1456 done 1457 LIBS="$cf_add_libs" 1458 1459@@ -23103,19 +23103,19 @@ 1460 (exit $ac_status); }; }; then 1461 cf_cxx_library=yes 1462 1463-cf_add_libs="-l$cf_gpp_libname" 1464-# Filter out duplicates - this happens with badly-designed ".pc" files... 1465-for cf_add_1lib in $CXXLIBS 1466-do 1467- for cf_add_2lib in $cf_add_libs 1468- do 1469- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1470- then 1471+cf_add_libs="$CXXLIBS" 1472+# reverse order 1473+cf_add_0lib= 1474+for cf_add_1lib in -l$cf_gpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1475+# filter duplicates 1476+for cf_add_1lib in $cf_add_0lib; do 1477+ for cf_add_2lib in $cf_add_libs; do 1478+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1479 cf_add_1lib= 1480 break 1481 fi 1482 done 1483- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1484+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1485 done 1486 CXXLIBS="$cf_add_libs" 1487 1488@@ -23163,19 +23163,19 @@ 1489 (exit $ac_status); }; }; then 1490 cf_cxx_library=yes 1491 1492-cf_add_libs="-l$cf_gpp_libname" 1493-# Filter out duplicates - this happens with badly-designed ".pc" files... 1494-for cf_add_1lib in $CXXLIBS 1495-do 1496- for cf_add_2lib in $cf_add_libs 1497- do 1498- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1499- then 1500+cf_add_libs="$CXXLIBS" 1501+# reverse order 1502+cf_add_0lib= 1503+for cf_add_1lib in -l$cf_gpp_libname; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1504+# filter duplicates 1505+for cf_add_1lib in $cf_add_0lib; do 1506+ for cf_add_2lib in $cf_add_libs; do 1507+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1508 cf_add_1lib= 1509 break 1510 fi 1511 done 1512- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1513+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1514 done 1515 CXXLIBS="$cf_add_libs" 1516 1517Index: dist.mk 1518Prereq: 1.1312 1519--- ncurses-6.1-20191026+/dist.mk 2019-10-26 08:56:47.000000000 +0000 1520+++ ncurses-6.1-20191102/dist.mk 2019-11-02 09:43:29.000000000 +0000 1521@@ -25,7 +25,7 @@ 1522 # use or other dealings in this Software without prior written # 1523 # authorization. # 1524 ############################################################################## 1525-# $Id: dist.mk,v 1.1312 2019/10/26 08:56:47 tom Exp $ 1526+# $Id: dist.mk,v 1.1313 2019/11/02 09:43:29 tom Exp $ 1527 # Makefile for creating ncurses distributions. 1528 # 1529 # This only needs to be used directly as a makefile by developers, but 1530@@ -37,7 +37,7 @@ 1531 # These define the major/minor/patch versions of ncurses. 1532 NCURSES_MAJOR = 6 1533 NCURSES_MINOR = 1 1534-NCURSES_PATCH = 20191026 1535+NCURSES_PATCH = 20191102 1536 1537 # We don't append the patch to the version, since this only applies to releases 1538 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) 1539Index: misc/terminfo.src 1540--- ncurses-6.1-20191026+/misc/terminfo.src 2019-10-26 17:00:56.000000000 +0000 1541+++ ncurses-6.1-20191102/misc/terminfo.src 2019-11-02 16:55:15.000000000 +0000 1542@@ -6,8 +6,8 @@ 1543 # Report bugs and new terminal descriptions to 1544 # bug-ncurses@gnu.org 1545 # 1546-# $Revision: 1.766 $ 1547-# $Date: 2019/10/26 17:00:56 $ 1548+# $Revision: 1.767 $ 1549+# $Date: 2019/11/02 16:55:15 $ 1550 # 1551 # The original header is preserved below for reference. It is noted that there 1552 # is a "newer" version which differs in some cosmetic details (but actually 1553@@ -4404,6 +4404,15 @@ 1554 use=xterm+kbs, use=vt100+enq, 1555 xterm-old|antique xterm version, 1556 use=xterm-r6, 1557+# The monochrome version began as a copy of "xtermm" (from Solaris), and was 1558+# initially part of the xterm sources (in XFree86). But "xterm" continued to 1559+# grow, while "xterm-mono" had none of the newer features. Additionally, 1560+# inheriting from "xtermm" runs into several problems, including different 1561+# function keys as well as the fact that the mouse support is not compatible. 1562+# This entry restores the original intent, intentionally not an alias to 1563+# simplify maintenance -TD 1564+xterm-mono|monochrome xterm, 1565+ use=xterm-r6, 1566 # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up. 1567 # The name has been changed and some aliases have been removed. 1568 xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System), 1569@@ -26385,4 +26394,7 @@ 1570 # + modify linux-16color to accommodate Linux console driver change in 1571 # early 2018 (report by Dino Petrucci). 1572 # 1573+# 2019-11-02 1574+# + add "xterm-mono" to help packagers (report by Sven Joachim) -TD 1575+# 1576 ######## SHANTIH! SHANTIH! SHANTIH! 1577Index: ncurses/base/lib_getch.c 1578Prereq: 1.137 1579--- ncurses-6.1-20191026+/ncurses/base/lib_getch.c 2018-06-24 00:06:37.000000000 +0000 1580+++ ncurses-6.1-20191102/ncurses/base/lib_getch.c 2019-11-03 00:11:16.000000000 +0000 1581@@ -1,5 +1,5 @@ 1582 /**************************************************************************** 1583- * Copyright (c) 1998-2016,2018 Free Software Foundation, Inc. * 1584+ * Copyright (c) 1998-2018,2019 Free Software Foundation, Inc. * 1585 * * 1586 * Permission is hereby granted, free of charge, to any person obtaining a * 1587 * copy of this software and associated documentation files (the * 1588@@ -42,7 +42,7 @@ 1589 1590 #include <curses.priv.h> 1591 1592-MODULE_ID("$Id: lib_getch.c,v 1.137 2018/06/24 00:06:37 tom Exp $") 1593+MODULE_ID("$Id: lib_getch.c,v 1.138 2019/11/03 00:11:16 tom Exp $") 1594 1595 #include <fifo_defs.h> 1596 1597@@ -69,16 +69,20 @@ 1598 NCURSES_SP_NAME(set_escdelay) (NCURSES_SP_DCLx int value) 1599 { 1600 int code = OK; 1601-#if USE_REENTRANT 1602- if (SP_PARM) { 1603- SET_ESCDELAY(value); 1604- } else { 1605+ if (value < 0) { 1606 code = ERR; 1607- } 1608+ } else { 1609+#if USE_REENTRANT 1610+ if (SP_PARM) { 1611+ SET_ESCDELAY(value); 1612+ } else { 1613+ code = ERR; 1614+ } 1615 #else 1616- (void) SP_PARM; 1617- ESCDELAY = value; 1618+ (void) SP_PARM; 1619+ ESCDELAY = value; 1620 #endif 1621+ } 1622 return code; 1623 } 1624 1625@@ -87,12 +91,16 @@ 1626 set_escdelay(int value) 1627 { 1628 int code; 1629+ if (value < 0) { 1630+ code = ERR; 1631+ } else { 1632 #if USE_REENTRANT 1633- code = NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value); 1634+ code = NCURSES_SP_NAME(set_escdelay) (CURRENT_SCREEN, value); 1635 #else 1636- ESCDELAY = value; 1637- code = OK; 1638+ ESCDELAY = value; 1639+ code = OK; 1640 #endif 1641+ } 1642 return code; 1643 } 1644 #endif 1645Index: ncurses/tinfo/lib_setup.c 1646Prereq: 1.204 1647--- ncurses-6.1-20191026+/ncurses/tinfo/lib_setup.c 2019-08-10 17:08:00.000000000 +0000 1648+++ ncurses-6.1-20191102/ncurses/tinfo/lib_setup.c 2019-11-03 00:07:45.000000000 +0000 1649@@ -48,7 +48,7 @@ 1650 #include <locale.h> 1651 #endif 1652 1653-MODULE_ID("$Id: lib_setup.c,v 1.204 2019/08/10 17:08:00 tom Exp $") 1654+MODULE_ID("$Id: lib_setup.c,v 1.206 2019/11/03 00:07:45 tom Exp $") 1655 1656 /**************************************************************************** 1657 * 1658@@ -173,16 +173,20 @@ 1659 NCURSES_SP_NAME(set_tabsize) (NCURSES_SP_DCLx int value) 1660 { 1661 int code = OK; 1662-#if USE_REENTRANT 1663- if (SP_PARM) { 1664- SP_PARM->_TABSIZE = value; 1665- } else { 1666+ if (value <= 0) { 1667 code = ERR; 1668- } 1669+ } else { 1670+#if USE_REENTRANT 1671+ if (SP_PARM) { 1672+ SP_PARM->_TABSIZE = value; 1673+ } else { 1674+ code = ERR; 1675+ } 1676 #else 1677- (void) SP_PARM; 1678- TABSIZE = value; 1679+ (void) SP_PARM; 1680+ TABSIZE = value; 1681 #endif 1682+ } 1683 return code; 1684 } 1685 1686Index: package/debian-mingw/changelog 1687--- ncurses-6.1-20191026+/package/debian-mingw/changelog 2019-10-26 08:56:47.000000000 +0000 1688+++ ncurses-6.1-20191102/package/debian-mingw/changelog 2019-11-02 09:43:29.000000000 +0000 1689@@ -1,8 +1,8 @@ 1690-ncurses6 (6.1+20191026) unstable; urgency=low 1691+ncurses6 (6.1+20191102) unstable; urgency=low 1692 1693 * latest weekly patch 1694 1695- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Oct 2019 04:56:47 -0400 1696+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Nov 2019 05:43:29 -0400 1697 1698 ncurses6 (5.9-20131005) unstable; urgency=low 1699 1700Index: package/debian-mingw64/changelog 1701--- ncurses-6.1-20191026+/package/debian-mingw64/changelog 2019-10-26 08:56:47.000000000 +0000 1702+++ ncurses-6.1-20191102/package/debian-mingw64/changelog 2019-11-02 09:43:29.000000000 +0000 1703@@ -1,8 +1,8 @@ 1704-ncurses6 (6.1+20191026) unstable; urgency=low 1705+ncurses6 (6.1+20191102) unstable; urgency=low 1706 1707 * latest weekly patch 1708 1709- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Oct 2019 04:56:47 -0400 1710+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Nov 2019 05:43:29 -0400 1711 1712 ncurses6 (5.9-20131005) unstable; urgency=low 1713 1714Index: package/debian/changelog 1715--- ncurses-6.1-20191026+/package/debian/changelog 2019-10-26 08:56:47.000000000 +0000 1716+++ ncurses-6.1-20191102/package/debian/changelog 2019-11-02 09:43:29.000000000 +0000 1717@@ -1,8 +1,8 @@ 1718-ncurses6 (6.1+20191026) unstable; urgency=low 1719+ncurses6 (6.1+20191102) unstable; urgency=low 1720 1721 * latest weekly patch 1722 1723- -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 26 Oct 2019 04:56:47 -0400 1724+ -- Thomas E. Dickey <dickey@invisible-island.net> Sat, 02 Nov 2019 05:43:29 -0400 1725 1726 ncurses6 (5.9-20120608) unstable; urgency=low 1727 1728Index: package/mingw-ncurses.nsi 1729Prereq: 1.358 1730--- ncurses-6.1-20191026+/package/mingw-ncurses.nsi 2019-10-26 08:56:47.000000000 +0000 1731+++ ncurses-6.1-20191102/package/mingw-ncurses.nsi 2019-11-02 09:43:29.000000000 +0000 1732@@ -1,4 +1,4 @@ 1733-; $Id: mingw-ncurses.nsi,v 1.358 2019/10/26 08:56:47 tom Exp $ 1734+; $Id: mingw-ncurses.nsi,v 1.359 2019/11/02 09:43:29 tom Exp $ 1735 1736 ; TODO add examples 1737 ; TODO bump ABI to 6 1738@@ -10,7 +10,7 @@ 1739 !define VERSION_MAJOR "6" 1740 !define VERSION_MINOR "1" 1741 !define VERSION_YYYY "2019" 1742-!define VERSION_MMDD "1026" 1743+!define VERSION_MMDD "1102" 1744 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} 1745 1746 !define MY_ABI "5" 1747Index: package/mingw-ncurses.spec 1748--- ncurses-6.1-20191026+/package/mingw-ncurses.spec 2019-10-26 08:56:47.000000000 +0000 1749+++ ncurses-6.1-20191102/package/mingw-ncurses.spec 2019-11-02 09:43:29.000000000 +0000 1750@@ -3,7 +3,7 @@ 1751 Summary: shared libraries for terminal handling 1752 Name: mingw32-ncurses6 1753 Version: 6.1 1754-Release: 20191026 1755+Release: 20191102 1756 License: X11 1757 Group: Development/Libraries 1758 Source: ncurses-%{version}-%{release}.tgz 1759Index: package/ncurses.spec 1760--- ncurses-6.1-20191026+/package/ncurses.spec 2019-10-26 08:56:47.000000000 +0000 1761+++ ncurses-6.1-20191102/package/ncurses.spec 2019-11-02 09:43:29.000000000 +0000 1762@@ -1,7 +1,7 @@ 1763 Summary: shared libraries for terminal handling 1764 Name: ncurses6 1765 Version: 6.1 1766-Release: 20191026 1767+Release: 20191102 1768 License: X11 1769 Group: Development/Libraries 1770 Source: ncurses-%{version}-%{release}.tgz 1771Index: package/ncursest.spec 1772--- ncurses-6.1-20191026+/package/ncursest.spec 2019-10-26 08:56:47.000000000 +0000 1773+++ ncurses-6.1-20191102/package/ncursest.spec 2019-11-02 09:43:29.000000000 +0000 1774@@ -1,7 +1,7 @@ 1775 Summary: Curses library with POSIX thread support. 1776 Name: ncursest6 1777 Version: 6.1 1778-Release: 20191026 1779+Release: 20191102 1780 License: X11 1781 Group: Development/Libraries 1782 Source: ncurses-%{version}-%{release}.tgz 1783Index: test/aclocal.m4 1784Prereq: 1.165 1785--- ncurses-6.1-20191026+/test/aclocal.m4 2019-09-07 23:58:37.000000000 +0000 1786+++ ncurses-6.1-20191102/test/aclocal.m4 2019-11-02 20:55:33.000000000 +0000 1787@@ -26,7 +26,7 @@ 1788 dnl authorization. * 1789 dnl*************************************************************************** 1790 dnl 1791-dnl $Id: aclocal.m4,v 1.165 2019/09/07 23:58:37 tom Exp $ 1792+dnl $Id: aclocal.m4,v 1.166 2019/11/02 20:55:33 tom Exp $ 1793 dnl 1794 dnl Author: Thomas E. Dickey 1795 dnl 1796@@ -280,7 +280,7 @@ 1797 fi 1798 ])dnl 1799 dnl --------------------------------------------------------------------------- 1800-dnl CF_ADD_LIBS version: 2 updated: 2014/07/13 14:33:27 1801+dnl CF_ADD_LIBS version: 3 updated: 2019/11/02 16:47:33 1802 dnl ----------- 1803 dnl Add one or more libraries, used to enforce consistency. Libraries are 1804 dnl prepended to an existing list, since their dependencies are assumed to 1805@@ -289,19 +289,19 @@ 1806 dnl $1 = libraries to add, with the "-l", etc. 1807 dnl $2 = variable to update (default $LIBS) 1808 AC_DEFUN([CF_ADD_LIBS],[ 1809-cf_add_libs="$1" 1810-# Filter out duplicates - this happens with badly-designed ".pc" files... 1811-for cf_add_1lib in [$]ifelse($2,,LIBS,[$2]) 1812-do 1813- for cf_add_2lib in $cf_add_libs 1814- do 1815- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1816- then 1817+cf_add_libs="[$]ifelse($2,,LIBS,[$2])" 1818+# reverse order 1819+cf_add_0lib= 1820+for cf_add_1lib in $1; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1821+# filter duplicates 1822+for cf_add_1lib in $cf_add_0lib; do 1823+ for cf_add_2lib in $cf_add_libs; do 1824+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1825 cf_add_1lib= 1826 break 1827 fi 1828 done 1829- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1830+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1831 done 1832 ifelse($2,,LIBS,[$2])="$cf_add_libs" 1833 ])dnl 1834Index: test/configure 1835--- ncurses-6.1-20191026+/test/configure 2019-09-07 23:59:06.000000000 +0000 1836+++ ncurses-6.1-20191102/test/configure 2019-11-02 20:55:58.000000000 +0000 1837@@ -3349,19 +3349,19 @@ 1838 echo "${ECHO_T}$ac_cv_lib_bsd_strlcat" >&6 1839 if test $ac_cv_lib_bsd_strlcat = yes; then 1840 1841-cf_add_libs="-lbsd" 1842-# Filter out duplicates - this happens with badly-designed ".pc" files... 1843-for cf_add_1lib in $LIBS 1844-do 1845- for cf_add_2lib in $cf_add_libs 1846- do 1847- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1848- then 1849+cf_add_libs="$LIBS" 1850+# reverse order 1851+cf_add_0lib= 1852+for cf_add_1lib in -lbsd; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1853+# filter duplicates 1854+for cf_add_1lib in $cf_add_0lib; do 1855+ for cf_add_2lib in $cf_add_libs; do 1856+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1857 cf_add_1lib= 1858 break 1859 fi 1860 done 1861- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1862+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1863 done 1864 LIBS="$cf_add_libs" 1865 1866@@ -6374,19 +6374,19 @@ 1867 echo "${ECHO_T}$ac_cv_lib_mytinfo_tgoto" >&6 1868 if test $ac_cv_lib_mytinfo_tgoto = yes; then 1869 1870-cf_add_libs="-lmytinfo" 1871-# Filter out duplicates - this happens with badly-designed ".pc" files... 1872-for cf_add_1lib in $LIBS 1873-do 1874- for cf_add_2lib in $cf_add_libs 1875- do 1876- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1877- then 1878+cf_add_libs="$LIBS" 1879+# reverse order 1880+cf_add_0lib= 1881+for cf_add_1lib in -lmytinfo; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1882+# filter duplicates 1883+for cf_add_1lib in $cf_add_0lib; do 1884+ for cf_add_2lib in $cf_add_libs; do 1885+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1886 cf_add_1lib= 1887 break 1888 fi 1889 done 1890- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1891+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1892 done 1893 LIBS="$cf_add_libs" 1894 1895@@ -6451,19 +6451,19 @@ 1896 echo "${ECHO_T}$ac_cv_lib_cur_colr_initscr" >&6 1897 if test $ac_cv_lib_cur_colr_initscr = yes; then 1898 1899-cf_add_libs="-lcur_colr" 1900-# Filter out duplicates - this happens with badly-designed ".pc" files... 1901-for cf_add_1lib in $LIBS 1902-do 1903- for cf_add_2lib in $cf_add_libs 1904- do 1905- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1906- then 1907+cf_add_libs="$LIBS" 1908+# reverse order 1909+cf_add_0lib= 1910+for cf_add_1lib in -lcur_colr; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1911+# filter duplicates 1912+for cf_add_1lib in $cf_add_0lib; do 1913+ for cf_add_2lib in $cf_add_libs; do 1914+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1915 cf_add_1lib= 1916 break 1917 fi 1918 done 1919- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1920+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1921 done 1922 LIBS="$cf_add_libs" 1923 1924@@ -6524,19 +6524,19 @@ 1925 1926 # HP's header uses __HP_CURSES, but user claims _HP_CURSES. 1927 1928-cf_add_libs="-lHcurses" 1929-# Filter out duplicates - this happens with badly-designed ".pc" files... 1930-for cf_add_1lib in $LIBS 1931-do 1932- for cf_add_2lib in $cf_add_libs 1933- do 1934- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1935- then 1936+cf_add_libs="$LIBS" 1937+# reverse order 1938+cf_add_0lib= 1939+for cf_add_1lib in -lHcurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1940+# filter duplicates 1941+for cf_add_1lib in $cf_add_0lib; do 1942+ for cf_add_2lib in $cf_add_libs; do 1943+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1944 cf_add_1lib= 1945 break 1946 fi 1947 done 1948- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1949+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1950 done 1951 LIBS="$cf_add_libs" 1952 1953@@ -6679,19 +6679,19 @@ 1954 done 1955 fi 1956 1957-cf_add_libs="-lcurses -ltermcap" 1958-# Filter out duplicates - this happens with badly-designed ".pc" files... 1959-for cf_add_1lib in $LIBS 1960-do 1961- for cf_add_2lib in $cf_add_libs 1962- do 1963- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1964- then 1965+cf_add_libs="$LIBS" 1966+# reverse order 1967+cf_add_0lib= 1968+for cf_add_1lib in -lcurses -ltermcap; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1969+# filter duplicates 1970+for cf_add_1lib in $cf_add_0lib; do 1971+ for cf_add_2lib in $cf_add_libs; do 1972+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 1973 cf_add_1lib= 1974 break 1975 fi 1976 done 1977- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 1978+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 1979 done 1980 LIBS="$cf_add_libs" 1981 1982@@ -7508,19 +7508,19 @@ 1983 done 1984 fi 1985 1986-cf_add_libs="$cf_cv_library_file_utf8" 1987-# Filter out duplicates - this happens with badly-designed ".pc" files... 1988-for cf_add_1lib in $LIBS 1989-do 1990- for cf_add_2lib in $cf_add_libs 1991- do 1992- if test "x$cf_add_1lib" = "x$cf_add_2lib" 1993- then 1994+cf_add_libs="$LIBS" 1995+# reverse order 1996+cf_add_0lib= 1997+for cf_add_1lib in $cf_cv_library_file_utf8; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 1998+# filter duplicates 1999+for cf_add_1lib in $cf_add_0lib; do 2000+ for cf_add_2lib in $cf_add_libs; do 2001+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2002 cf_add_1lib= 2003 break 2004 fi 2005 done 2006- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2007+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2008 done 2009 LIBS="$cf_add_libs" 2010 2011@@ -7641,19 +7641,19 @@ 2012 2013 fi 2014 2015-cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" 2016-# Filter out duplicates - this happens with badly-designed ".pc" files... 2017-for cf_add_1lib in $LIBS 2018-do 2019- for cf_add_2lib in $cf_add_libs 2020- do 2021- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2022- then 2023+cf_add_libs="$LIBS" 2024+# reverse order 2025+cf_add_0lib= 2026+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2027+# filter duplicates 2028+for cf_add_1lib in $cf_add_0lib; do 2029+ for cf_add_2lib in $cf_add_libs; do 2030+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2031 cf_add_1lib= 2032 break 2033 fi 2034 done 2035- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2036+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2037 done 2038 LIBS="$cf_add_libs" 2039 2040@@ -8018,19 +8018,19 @@ 2041 2042 fi 2043 2044-cf_add_libs="`$NCURSES_CONFIG --libs`" 2045-# Filter out duplicates - this happens with badly-designed ".pc" files... 2046-for cf_add_1lib in $LIBS 2047-do 2048- for cf_add_2lib in $cf_add_libs 2049- do 2050- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2051- then 2052+cf_add_libs="$LIBS" 2053+# reverse order 2054+cf_add_0lib= 2055+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2056+# filter duplicates 2057+for cf_add_1lib in $cf_add_0lib; do 2058+ for cf_add_2lib in $cf_add_libs; do 2059+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2060 cf_add_1lib= 2061 break 2062 fi 2063 done 2064- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2065+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2066 done 2067 LIBS="$cf_add_libs" 2068 2069@@ -9036,38 +9036,38 @@ 2070 ;; 2071 esac 2072 2073-cf_add_libs="$cf_ncurses_LIBS" 2074-# Filter out duplicates - this happens with badly-designed ".pc" files... 2075-for cf_add_1lib in $LIBS 2076-do 2077- for cf_add_2lib in $cf_add_libs 2078- do 2079- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2080- then 2081+cf_add_libs="$LIBS" 2082+# reverse order 2083+cf_add_0lib= 2084+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2085+# filter duplicates 2086+for cf_add_1lib in $cf_add_0lib; do 2087+ for cf_add_2lib in $cf_add_libs; do 2088+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2089 cf_add_1lib= 2090 break 2091 fi 2092 done 2093- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2094+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2095 done 2096 LIBS="$cf_add_libs" 2097 2098 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 2099 then 2100 2101-cf_add_libs="-l$cf_nculib_root" 2102-# Filter out duplicates - this happens with badly-designed ".pc" files... 2103-for cf_add_1lib in $LIBS 2104-do 2105- for cf_add_2lib in $cf_add_libs 2106- do 2107- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2108- then 2109+cf_add_libs="$LIBS" 2110+# reverse order 2111+cf_add_0lib= 2112+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2113+# filter duplicates 2114+for cf_add_1lib in $cf_add_0lib; do 2115+ for cf_add_2lib in $cf_add_libs; do 2116+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2117 cf_add_1lib= 2118 break 2119 fi 2120 done 2121- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2122+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2123 done 2124 LIBS="$cf_add_libs" 2125 2126@@ -9471,19 +9471,19 @@ 2127 2128 fi 2129 2130-cf_add_libs="`$PKG_CONFIG --libs $cf_ncuconfig_root`" 2131-# Filter out duplicates - this happens with badly-designed ".pc" files... 2132-for cf_add_1lib in $LIBS 2133-do 2134- for cf_add_2lib in $cf_add_libs 2135- do 2136- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2137- then 2138+cf_add_libs="$LIBS" 2139+# reverse order 2140+cf_add_0lib= 2141+for cf_add_1lib in `$PKG_CONFIG --libs $cf_ncuconfig_root`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2142+# filter duplicates 2143+for cf_add_1lib in $cf_add_0lib; do 2144+ for cf_add_2lib in $cf_add_libs; do 2145+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2146 cf_add_1lib= 2147 break 2148 fi 2149 done 2150- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2151+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2152 done 2153 LIBS="$cf_add_libs" 2154 2155@@ -9848,19 +9848,19 @@ 2156 2157 fi 2158 2159-cf_add_libs="`$NCURSES_CONFIG --libs`" 2160-# Filter out duplicates - this happens with badly-designed ".pc" files... 2161-for cf_add_1lib in $LIBS 2162-do 2163- for cf_add_2lib in $cf_add_libs 2164- do 2165- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2166- then 2167+cf_add_libs="$LIBS" 2168+# reverse order 2169+cf_add_0lib= 2170+for cf_add_1lib in `$NCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2171+# filter duplicates 2172+for cf_add_1lib in $cf_add_0lib; do 2173+ for cf_add_2lib in $cf_add_libs; do 2174+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2175 cf_add_1lib= 2176 break 2177 fi 2178 done 2179- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2180+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2181 done 2182 LIBS="$cf_add_libs" 2183 2184@@ -10866,38 +10866,38 @@ 2185 ;; 2186 esac 2187 2188-cf_add_libs="$cf_ncurses_LIBS" 2189-# Filter out duplicates - this happens with badly-designed ".pc" files... 2190-for cf_add_1lib in $LIBS 2191-do 2192- for cf_add_2lib in $cf_add_libs 2193- do 2194- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2195- then 2196+cf_add_libs="$LIBS" 2197+# reverse order 2198+cf_add_0lib= 2199+for cf_add_1lib in $cf_ncurses_LIBS; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2200+# filter duplicates 2201+for cf_add_1lib in $cf_add_0lib; do 2202+ for cf_add_2lib in $cf_add_libs; do 2203+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2204 cf_add_1lib= 2205 break 2206 fi 2207 done 2208- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2209+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2210 done 2211 LIBS="$cf_add_libs" 2212 2213 if ( test -n "$cf_cv_curses_dir" && test "$cf_cv_curses_dir" != "no" ) 2214 then 2215 2216-cf_add_libs="-l$cf_nculib_root" 2217-# Filter out duplicates - this happens with badly-designed ".pc" files... 2218-for cf_add_1lib in $LIBS 2219-do 2220- for cf_add_2lib in $cf_add_libs 2221- do 2222- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2223- then 2224+cf_add_libs="$LIBS" 2225+# reverse order 2226+cf_add_0lib= 2227+for cf_add_1lib in -l$cf_nculib_root; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2228+# filter duplicates 2229+for cf_add_1lib in $cf_add_0lib; do 2230+ for cf_add_2lib in $cf_add_libs; do 2231+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2232 cf_add_1lib= 2233 break 2234 fi 2235 done 2236- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2237+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2238 done 2239 LIBS="$cf_add_libs" 2240 2241@@ -12463,19 +12463,19 @@ 2242 2243 fi 2244 2245-cf_add_libs="$cf_pkgconfig_libs" 2246-# Filter out duplicates - this happens with badly-designed ".pc" files... 2247-for cf_add_1lib in $LIBS 2248-do 2249- for cf_add_2lib in $cf_add_libs 2250- do 2251- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2252- then 2253+cf_add_libs="$LIBS" 2254+# reverse order 2255+cf_add_0lib= 2256+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2257+# filter duplicates 2258+for cf_add_1lib in $cf_add_0lib; do 2259+ for cf_add_2lib in $cf_add_libs; do 2260+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2261 cf_add_1lib= 2262 break 2263 fi 2264 done 2265- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2266+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2267 done 2268 LIBS="$cf_add_libs" 2269 2270@@ -12672,19 +12672,19 @@ 2271 2272 fi 2273 2274-cf_add_libs="$cf_pkgconfig_libs" 2275-# Filter out duplicates - this happens with badly-designed ".pc" files... 2276-for cf_add_1lib in $LIBS 2277-do 2278- for cf_add_2lib in $cf_add_libs 2279- do 2280- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2281- then 2282+cf_add_libs="$LIBS" 2283+# reverse order 2284+cf_add_0lib= 2285+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2286+# filter duplicates 2287+for cf_add_1lib in $cf_add_0lib; do 2288+ for cf_add_2lib in $cf_add_libs; do 2289+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2290 cf_add_1lib= 2291 break 2292 fi 2293 done 2294- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2295+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2296 done 2297 LIBS="$cf_add_libs" 2298 2299@@ -12856,19 +12856,19 @@ 2300 2301 fi 2302 2303-cf_add_libs="$cf_pkgconfig_libs" 2304-# Filter out duplicates - this happens with badly-designed ".pc" files... 2305-for cf_add_1lib in $LIBS 2306-do 2307- for cf_add_2lib in $cf_add_libs 2308- do 2309- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2310- then 2311+cf_add_libs="$LIBS" 2312+# reverse order 2313+cf_add_0lib= 2314+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2315+# filter duplicates 2316+for cf_add_1lib in $cf_add_0lib; do 2317+ for cf_add_2lib in $cf_add_libs; do 2318+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2319 cf_add_1lib= 2320 break 2321 fi 2322 done 2323- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2324+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2325 done 2326 LIBS="$cf_add_libs" 2327 2328@@ -12928,19 +12928,19 @@ 2329 echo "${ECHO_T}$ac_cv_lib_Xext_XextCreateExtension" >&6 2330 if test $ac_cv_lib_Xext_XextCreateExtension = yes; then 2331 2332-cf_add_libs="-lXext" 2333-# Filter out duplicates - this happens with badly-designed ".pc" files... 2334-for cf_add_1lib in $LIBS 2335-do 2336- for cf_add_2lib in $cf_add_libs 2337- do 2338- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2339- then 2340+cf_add_libs="$LIBS" 2341+# reverse order 2342+cf_add_0lib= 2343+for cf_add_1lib in -lXext; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2344+# filter duplicates 2345+for cf_add_1lib in $cf_add_0lib; do 2346+ for cf_add_2lib in $cf_add_libs; do 2347+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2348 cf_add_1lib= 2349 break 2350 fi 2351 done 2352- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2353+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2354 done 2355 LIBS="$cf_add_libs" 2356 2357@@ -13070,19 +13070,19 @@ 2358 2359 fi 2360 2361-cf_add_libs="$cf_pkgconfig_libs" 2362-# Filter out duplicates - this happens with badly-designed ".pc" files... 2363-for cf_add_1lib in $LIBS 2364-do 2365- for cf_add_2lib in $cf_add_libs 2366- do 2367- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2368- then 2369+cf_add_libs="$LIBS" 2370+# reverse order 2371+cf_add_0lib= 2372+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2373+# filter duplicates 2374+for cf_add_1lib in $cf_add_0lib; do 2375+ for cf_add_2lib in $cf_add_libs; do 2376+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2377 cf_add_1lib= 2378 break 2379 fi 2380 done 2381- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2382+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2383 done 2384 LIBS="$cf_add_libs" 2385 2386@@ -13207,19 +13207,19 @@ 2387 2388 fi 2389 2390-cf_add_libs="$cf_pkgconfig_libs" 2391-# Filter out duplicates - this happens with badly-designed ".pc" files... 2392-for cf_add_1lib in $LIBS 2393-do 2394- for cf_add_2lib in $cf_add_libs 2395- do 2396- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2397- then 2398+cf_add_libs="$LIBS" 2399+# reverse order 2400+cf_add_0lib= 2401+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2402+# filter duplicates 2403+for cf_add_1lib in $cf_add_0lib; do 2404+ for cf_add_2lib in $cf_add_libs; do 2405+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2406 cf_add_1lib= 2407 break 2408 fi 2409 done 2410- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2411+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2412 done 2413 LIBS="$cf_add_libs" 2414 2415@@ -13344,19 +13344,19 @@ 2416 2417 fi 2418 2419-cf_add_libs="$cf_pkgconfig_libs" 2420-# Filter out duplicates - this happens with badly-designed ".pc" files... 2421-for cf_add_1lib in $LIBS 2422-do 2423- for cf_add_2lib in $cf_add_libs 2424- do 2425- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2426- then 2427+cf_add_libs="$LIBS" 2428+# reverse order 2429+cf_add_0lib= 2430+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2431+# filter duplicates 2432+for cf_add_1lib in $cf_add_0lib; do 2433+ for cf_add_2lib in $cf_add_libs; do 2434+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2435 cf_add_1lib= 2436 break 2437 fi 2438 done 2439- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2440+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2441 done 2442 LIBS="$cf_add_libs" 2443 2444@@ -13481,19 +13481,19 @@ 2445 2446 fi 2447 2448-cf_add_libs="$cf_pkgconfig_libs" 2449-# Filter out duplicates - this happens with badly-designed ".pc" files... 2450-for cf_add_1lib in $LIBS 2451-do 2452- for cf_add_2lib in $cf_add_libs 2453- do 2454- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2455- then 2456+cf_add_libs="$LIBS" 2457+# reverse order 2458+cf_add_0lib= 2459+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2460+# filter duplicates 2461+for cf_add_1lib in $cf_add_0lib; do 2462+ for cf_add_2lib in $cf_add_libs; do 2463+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2464 cf_add_1lib= 2465 break 2466 fi 2467 done 2468- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2469+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2470 done 2471 LIBS="$cf_add_libs" 2472 2473@@ -13622,19 +13622,19 @@ 2474 2475 fi 2476 2477-cf_add_libs="$cf_pkgconfig_libs" 2478-# Filter out duplicates - this happens with badly-designed ".pc" files... 2479-for cf_add_1lib in $LIBS 2480-do 2481- for cf_add_2lib in $cf_add_libs 2482- do 2483- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2484- then 2485+cf_add_libs="$LIBS" 2486+# reverse order 2487+cf_add_0lib= 2488+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2489+# filter duplicates 2490+for cf_add_1lib in $cf_add_0lib; do 2491+ for cf_add_2lib in $cf_add_libs; do 2492+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2493 cf_add_1lib= 2494 break 2495 fi 2496 done 2497- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2498+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2499 done 2500 LIBS="$cf_add_libs" 2501 2502@@ -13811,19 +13811,19 @@ 2503 2504 fi 2505 2506-cf_add_libs="$cf_pkgconfig_libs" 2507-# Filter out duplicates - this happens with badly-designed ".pc" files... 2508-for cf_add_1lib in $LIBS 2509-do 2510- for cf_add_2lib in $cf_add_libs 2511- do 2512- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2513- then 2514+cf_add_libs="$LIBS" 2515+# reverse order 2516+cf_add_0lib= 2517+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2518+# filter duplicates 2519+for cf_add_1lib in $cf_add_0lib; do 2520+ for cf_add_2lib in $cf_add_libs; do 2521+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2522 cf_add_1lib= 2523 break 2524 fi 2525 done 2526- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2527+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2528 done 2529 LIBS="$cf_add_libs" 2530 2531@@ -14017,19 +14017,19 @@ 2532 2533 fi 2534 2535-cf_add_libs="$cf_pkgconfig_libs" 2536-# Filter out duplicates - this happens with badly-designed ".pc" files... 2537-for cf_add_1lib in $LIBS 2538-do 2539- for cf_add_2lib in $cf_add_libs 2540- do 2541- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2542- then 2543+cf_add_libs="$LIBS" 2544+# reverse order 2545+cf_add_0lib= 2546+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2547+# filter duplicates 2548+for cf_add_1lib in $cf_add_0lib; do 2549+ for cf_add_2lib in $cf_add_libs; do 2550+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2551 cf_add_1lib= 2552 break 2553 fi 2554 done 2555- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2556+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2557 done 2558 LIBS="$cf_add_libs" 2559 2560@@ -14146,19 +14146,19 @@ 2561 2562 fi 2563 2564-cf_add_libs="$cf_pkgconfig_libs" 2565-# Filter out duplicates - this happens with badly-designed ".pc" files... 2566-for cf_add_1lib in $LIBS 2567-do 2568- for cf_add_2lib in $cf_add_libs 2569- do 2570- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2571- then 2572+cf_add_libs="$LIBS" 2573+# reverse order 2574+cf_add_0lib= 2575+for cf_add_1lib in $cf_pkgconfig_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2576+# filter duplicates 2577+for cf_add_1lib in $cf_add_0lib; do 2578+ for cf_add_2lib in $cf_add_libs; do 2579+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2580 cf_add_1lib= 2581 break 2582 fi 2583 done 2584- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2585+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2586 done 2587 LIBS="$cf_add_libs" 2588 2589@@ -14469,19 +14469,19 @@ 2590 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 2591 if test $ac_cv_lib_X11_XOpenDisplay = yes; then 2592 2593-cf_add_libs="-lX11" 2594-# Filter out duplicates - this happens with badly-designed ".pc" files... 2595-for cf_add_1lib in $LIBS 2596-do 2597- for cf_add_2lib in $cf_add_libs 2598- do 2599- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2600- then 2601+cf_add_libs="$LIBS" 2602+# reverse order 2603+cf_add_0lib= 2604+for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2605+# filter duplicates 2606+for cf_add_1lib in $cf_add_0lib; do 2607+ for cf_add_2lib in $cf_add_libs; do 2608+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2609 cf_add_1lib= 2610 break 2611 fi 2612 done 2613- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2614+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2615 done 2616 LIBS="$cf_add_libs" 2617 2618@@ -14725,19 +14725,19 @@ 2619 cf_test=XawSimpleMenuAddGlobalActions 2620 if test $cf_path != default ; then 2621 2622-cf_add_libs="-L$cf_path/lib $cf_libs" 2623-# Filter out duplicates - this happens with badly-designed ".pc" files... 2624-for cf_add_1lib in $LIBS 2625-do 2626- for cf_add_2lib in $cf_add_libs 2627- do 2628- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2629- then 2630+cf_add_libs="$LIBS" 2631+# reverse order 2632+cf_add_0lib= 2633+for cf_add_1lib in -L$cf_path/lib $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2634+# filter duplicates 2635+for cf_add_1lib in $cf_add_0lib; do 2636+ for cf_add_2lib in $cf_add_libs; do 2637+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2638 cf_add_1lib= 2639 break 2640 fi 2641 done 2642- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2643+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2644 done 2645 LIBS="$cf_add_libs" 2646 2647@@ -14745,19 +14745,19 @@ 2648 echo $ECHO_N "checking for $cf_libs in $cf_path... $ECHO_C" >&6 2649 else 2650 2651-cf_add_libs="$cf_libs" 2652-# Filter out duplicates - this happens with badly-designed ".pc" files... 2653-for cf_add_1lib in $LIBS 2654-do 2655- for cf_add_2lib in $cf_add_libs 2656- do 2657- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2658- then 2659+cf_add_libs="$LIBS" 2660+# reverse order 2661+cf_add_0lib= 2662+for cf_add_1lib in $cf_libs; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2663+# filter duplicates 2664+for cf_add_1lib in $cf_add_0lib; do 2665+ for cf_add_2lib in $cf_add_libs; do 2666+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2667 cf_add_1lib= 2668 break 2669 fi 2670 done 2671- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2672+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2673 done 2674 LIBS="$cf_add_libs" 2675 2676@@ -15007,19 +15007,19 @@ 2677 2678 fi 2679 2680-cf_add_libs="`$XCURSES_CONFIG --libs`" 2681-# Filter out duplicates - this happens with badly-designed ".pc" files... 2682-for cf_add_1lib in $LIBS 2683-do 2684- for cf_add_2lib in $cf_add_libs 2685- do 2686- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2687- then 2688+cf_add_libs="$LIBS" 2689+# reverse order 2690+cf_add_0lib= 2691+for cf_add_1lib in `$XCURSES_CONFIG --libs`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2692+# filter duplicates 2693+for cf_add_1lib in $cf_add_0lib; do 2694+ for cf_add_2lib in $cf_add_libs; do 2695+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2696 cf_add_1lib= 2697 break 2698 fi 2699 done 2700- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2701+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2702 done 2703 LIBS="$cf_add_libs" 2704 2705@@ -15238,19 +15238,19 @@ 2706 echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 2707 if test $ac_cv_lib_X11_XOpenDisplay = yes; then 2708 2709-cf_add_libs="-lX11" 2710-# Filter out duplicates - this happens with badly-designed ".pc" files... 2711-for cf_add_1lib in $LIBS 2712-do 2713- for cf_add_2lib in $cf_add_libs 2714- do 2715- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2716- then 2717+cf_add_libs="$LIBS" 2718+# reverse order 2719+cf_add_0lib= 2720+for cf_add_1lib in -lX11; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2721+# filter duplicates 2722+for cf_add_1lib in $cf_add_0lib; do 2723+ for cf_add_2lib in $cf_add_libs; do 2724+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2725 cf_add_1lib= 2726 break 2727 fi 2728 done 2729- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2730+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2731 done 2732 LIBS="$cf_add_libs" 2733 2734@@ -15262,19 +15262,19 @@ 2735 echo $ECHO_N "(cached) $ECHO_C" >&6 2736 else 2737 2738-cf_add_libs="-lXCurses" 2739-# Filter out duplicates - this happens with badly-designed ".pc" files... 2740-for cf_add_1lib in $LIBS 2741-do 2742- for cf_add_2lib in $cf_add_libs 2743- do 2744- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2745- then 2746+cf_add_libs="$LIBS" 2747+# reverse order 2748+cf_add_0lib= 2749+for cf_add_1lib in -lXCurses; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2750+# filter duplicates 2751+for cf_add_1lib in $cf_add_0lib; do 2752+ for cf_add_2lib in $cf_add_libs; do 2753+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2754 cf_add_1lib= 2755 break 2756 fi 2757 done 2758- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2759+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2760 done 2761 LIBS="$cf_add_libs" 2762 2763@@ -15448,19 +15448,19 @@ 2764 if test "$cf_cv_ncurses_pthreads" = yes 2765 then 2766 2767-cf_add_libs="-lpthread" 2768-# Filter out duplicates - this happens with badly-designed ".pc" files... 2769-for cf_add_1lib in $LIBS 2770-do 2771- for cf_add_2lib in $cf_add_libs 2772- do 2773- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2774- then 2775+cf_add_libs="$LIBS" 2776+# reverse order 2777+cf_add_0lib= 2778+for cf_add_1lib in -lpthread; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2779+# filter duplicates 2780+for cf_add_1lib in $cf_add_0lib; do 2781+ for cf_add_2lib in $cf_add_libs; do 2782+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2783 cf_add_1lib= 2784 break 2785 fi 2786 done 2787- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2788+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2789 done 2790 LIBS="$cf_add_libs" 2791 2792@@ -15723,19 +15723,19 @@ 2793 2794 fi 2795 2796-cf_add_libs="`$PKG_CONFIG --libs panel$cf_cv_libtype`" 2797-# Filter out duplicates - this happens with badly-designed ".pc" files... 2798-for cf_add_1lib in $LIBS 2799-do 2800- for cf_add_2lib in $cf_add_libs 2801- do 2802- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2803- then 2804+cf_add_libs="$LIBS" 2805+# reverse order 2806+cf_add_0lib= 2807+for cf_add_1lib in `$PKG_CONFIG --libs panel$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2808+# filter duplicates 2809+for cf_add_1lib in $cf_add_0lib; do 2810+ for cf_add_2lib in $cf_add_libs; do 2811+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2812 cf_add_1lib= 2813 break 2814 fi 2815 done 2816- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2817+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2818 done 2819 LIBS="$cf_add_libs" 2820 2821@@ -15872,19 +15872,19 @@ 2822 2823 cf_upper=`echo "have_libpanel" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 2824 2825-cf_add_libs="-lpanel$cf_cv_libtype" 2826-# Filter out duplicates - this happens with badly-designed ".pc" files... 2827-for cf_add_1lib in $LIBS 2828-do 2829- for cf_add_2lib in $cf_add_libs 2830- do 2831- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2832- then 2833+cf_add_libs="$LIBS" 2834+# reverse order 2835+cf_add_0lib= 2836+for cf_add_1lib in -lpanel$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2837+# filter duplicates 2838+for cf_add_1lib in $cf_add_0lib; do 2839+ for cf_add_2lib in $cf_add_libs; do 2840+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2841 cf_add_1lib= 2842 break 2843 fi 2844 done 2845- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2846+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2847 done 2848 LIBS="$cf_add_libs" 2849 2850@@ -16098,19 +16098,19 @@ 2851 2852 fi 2853 2854-cf_add_libs="`$PKG_CONFIG --libs menu$cf_cv_libtype`" 2855-# Filter out duplicates - this happens with badly-designed ".pc" files... 2856-for cf_add_1lib in $LIBS 2857-do 2858- for cf_add_2lib in $cf_add_libs 2859- do 2860- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2861- then 2862+cf_add_libs="$LIBS" 2863+# reverse order 2864+cf_add_0lib= 2865+for cf_add_1lib in `$PKG_CONFIG --libs menu$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2866+# filter duplicates 2867+for cf_add_1lib in $cf_add_0lib; do 2868+ for cf_add_2lib in $cf_add_libs; do 2869+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2870 cf_add_1lib= 2871 break 2872 fi 2873 done 2874- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2875+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2876 done 2877 LIBS="$cf_add_libs" 2878 2879@@ -16247,19 +16247,19 @@ 2880 2881 cf_upper=`echo "have_libmenu" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 2882 2883-cf_add_libs="-lmenu$cf_cv_libtype" 2884-# Filter out duplicates - this happens with badly-designed ".pc" files... 2885-for cf_add_1lib in $LIBS 2886-do 2887- for cf_add_2lib in $cf_add_libs 2888- do 2889- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2890- then 2891+cf_add_libs="$LIBS" 2892+# reverse order 2893+cf_add_0lib= 2894+for cf_add_1lib in -lmenu$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2895+# filter duplicates 2896+for cf_add_1lib in $cf_add_0lib; do 2897+ for cf_add_2lib in $cf_add_libs; do 2898+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2899 cf_add_1lib= 2900 break 2901 fi 2902 done 2903- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2904+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2905 done 2906 LIBS="$cf_add_libs" 2907 2908@@ -16474,19 +16474,19 @@ 2909 2910 fi 2911 2912-cf_add_libs="`$PKG_CONFIG --libs form$cf_cv_libtype`" 2913-# Filter out duplicates - this happens with badly-designed ".pc" files... 2914-for cf_add_1lib in $LIBS 2915-do 2916- for cf_add_2lib in $cf_add_libs 2917- do 2918- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2919- then 2920+cf_add_libs="$LIBS" 2921+# reverse order 2922+cf_add_0lib= 2923+for cf_add_1lib in `$PKG_CONFIG --libs form$cf_cv_libtype`; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2924+# filter duplicates 2925+for cf_add_1lib in $cf_add_0lib; do 2926+ for cf_add_2lib in $cf_add_libs; do 2927+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2928 cf_add_1lib= 2929 break 2930 fi 2931 done 2932- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2933+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2934 done 2935 LIBS="$cf_add_libs" 2936 2937@@ -16623,19 +16623,19 @@ 2938 2939 cf_upper=`echo "have_libform" | sed y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%` 2940 2941-cf_add_libs="-lform$cf_cv_libtype" 2942-# Filter out duplicates - this happens with badly-designed ".pc" files... 2943-for cf_add_1lib in $LIBS 2944-do 2945- for cf_add_2lib in $cf_add_libs 2946- do 2947- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2948- then 2949+cf_add_libs="$LIBS" 2950+# reverse order 2951+cf_add_0lib= 2952+for cf_add_1lib in -lform$cf_cv_libtype; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2953+# filter duplicates 2954+for cf_add_1lib in $cf_add_0lib; do 2955+ for cf_add_2lib in $cf_add_libs; do 2956+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2957 cf_add_1lib= 2958 break 2959 fi 2960 done 2961- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2962+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2963 done 2964 LIBS="$cf_add_libs" 2965 2966@@ -18371,19 +18371,19 @@ 2967 2968 cf_save_LIBS="$LIBS" 2969 test $cf_cv_lib_util = yes && { 2970-cf_add_libs="-lutil" 2971-# Filter out duplicates - this happens with badly-designed ".pc" files... 2972-for cf_add_1lib in $LIBS 2973-do 2974- for cf_add_2lib in $cf_add_libs 2975- do 2976- if test "x$cf_add_1lib" = "x$cf_add_2lib" 2977- then 2978+cf_add_libs="$LIBS" 2979+# reverse order 2980+cf_add_0lib= 2981+for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 2982+# filter duplicates 2983+for cf_add_1lib in $cf_add_0lib; do 2984+ for cf_add_2lib in $cf_add_libs; do 2985+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 2986 cf_add_1lib= 2987 break 2988 fi 2989 done 2990- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 2991+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 2992 done 2993 LIBS="$cf_add_libs" 2994 } 2995@@ -18449,19 +18449,19 @@ 2996 2997 if test "x$cf_cv_lib_util" = xyes ; then 2998 2999-cf_add_libs="-lutil" 3000-# Filter out duplicates - this happens with badly-designed ".pc" files... 3001-for cf_add_1lib in $TEST_LIBS 3002-do 3003- for cf_add_2lib in $cf_add_libs 3004- do 3005- if test "x$cf_add_1lib" = "x$cf_add_2lib" 3006- then 3007+cf_add_libs="$TEST_LIBS" 3008+# reverse order 3009+cf_add_0lib= 3010+for cf_add_1lib in -lutil; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 3011+# filter duplicates 3012+for cf_add_1lib in $cf_add_0lib; do 3013+ for cf_add_2lib in $cf_add_libs; do 3014+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 3015 cf_add_1lib= 3016 break 3017 fi 3018 done 3019- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 3020+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 3021 done 3022 TEST_LIBS="$cf_add_libs" 3023 3024@@ -20501,19 +20501,19 @@ 3025 echo $ECHO_N "checking if we need a space after rpath option... $ECHO_C" >&6 3026 cf_save_LIBS="$LIBS" 3027 3028-cf_add_libs="${LD_RPATH_OPT}$libdir" 3029-# Filter out duplicates - this happens with badly-designed ".pc" files... 3030-for cf_add_1lib in $LIBS 3031-do 3032- for cf_add_2lib in $cf_add_libs 3033- do 3034- if test "x$cf_add_1lib" = "x$cf_add_2lib" 3035- then 3036+cf_add_libs="$LIBS" 3037+# reverse order 3038+cf_add_0lib= 3039+for cf_add_1lib in ${LD_RPATH_OPT}$libdir; do cf_add_0lib="$cf_add_1lib $cf_add_0lib"; done 3040+# filter duplicates 3041+for cf_add_1lib in $cf_add_0lib; do 3042+ for cf_add_2lib in $cf_add_libs; do 3043+ if test "x$cf_add_1lib" = "x$cf_add_2lib"; then 3044 cf_add_1lib= 3045 break 3046 fi 3047 done 3048- test -n "$cf_add_1lib" && cf_add_libs="$cf_add_libs $cf_add_1lib" 3049+ test -n "$cf_add_1lib" && cf_add_libs="$cf_add_1lib $cf_add_libs" 3050 done 3051 LIBS="$cf_add_libs" 3052 3053