From 8d8a3537cd58af7879c6e1921235daeed2b74926 Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 6 Oct 2019 00:58:27 +0000 Subject: [PATCH] ncurses 6.1 - patch 20191005 + modify the ncurse*-config and pc-files to more closely match for the -I and -l options. --- NEWS | 6 +++++- VERSION | 2 +- dist.mk | 4 ++-- misc/gen-pkgconfig.in | 5 +++-- misc/ncurses-config.in | 4 ++-- package/debian-mingw/changelog | 4 ++-- package/debian-mingw64/changelog | 4 ++-- package/debian/changelog | 4 ++-- package/mingw-ncurses.nsi | 4 ++-- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- package/ncursest.spec | 2 +- 12 files changed, 24 insertions(+), 19 deletions(-) diff --git a/NEWS b/NEWS index f5a22c16..ea31648a 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.3380 2019/09/28 12:57:39 tom Exp $ +-- $Id: NEWS,v 1.3382 2019/10/05 22:53:18 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,10 @@ See the AUTHORS file for the corresponding full names. Changes through 1.9.9e did not credit all contributions; it is not possible to add this information. +20191005 + + modify the ncurse*-config and pc-files to more closely match for the + -I and -l options. + 20190928 + amend the ncurse*-config and pc-files to take into account the rpath hack which differed between those files. diff --git a/VERSION b/VERSION index 4e016611..aec564a4 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5:0:10 6.1 20190928 +5:0:10 6.1 20191005 diff --git a/dist.mk b/dist.mk index 397ae03a..1994b91c 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.1307 2019/09/27 18:43:59 tom Exp $ +# $Id: dist.mk,v 1.1308 2019/10/05 14:44:23 tom Exp $ # Makefile for creating ncurses distributions. # # This only needs to be used directly as a makefile by developers, but @@ -37,7 +37,7 @@ SHELL = /bin/sh # These define the major/minor/patch versions of ncurses. NCURSES_MAJOR = 6 NCURSES_MINOR = 1 -NCURSES_PATCH = 20190928 +NCURSES_PATCH = 20191005 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/misc/gen-pkgconfig.in b/misc/gen-pkgconfig.in index aacd681a..6d975ea8 100644 --- a/misc/gen-pkgconfig.in +++ b/misc/gen-pkgconfig.in @@ -1,5 +1,5 @@ #!@SHELL@ -# $Id: gen-pkgconfig.in,v 1.36 2019/09/28 12:53:53 tom Exp $ +# $Id: gen-pkgconfig.in,v 1.38 2019/10/05 22:25:47 tom Exp $ ############################################################################## # Copyright (c) 2009-2018,2019 Free Software Foundation, Inc. # # # @@ -70,11 +70,11 @@ CFLAGS="@PKG_CFLAGS@" if [ "$includedir" != "/usr/include" ]; then includetop=`echo "$includedir" | sed -e 's,/include/[^/]*$,/include,'` [ "$includetop" = "/usr/include" ] && includetop="$includedir" + CFLAGS="$CFLAGS -I\${includedir}" if [ "x$includetop" != "x$includedir" ] then CFLAGS="$CFLAGS -I${includetop}" fi - CFLAGS="$CFLAGS -I\${includedir}" fi LDFLAGS= @@ -106,6 +106,7 @@ do if [ $name = $MAIN_LIBRARY ]; then desc="$desc library" [ $NEED_TINFO = yes ] && LIBS="$LIBS -l$TINFO_ARG_SUFFIX" + [ -n "@LIBS@" ] && LIBS="$LIBS @LIBS@" elif [ $name = $SUB_LIBRARY ]; then desc="$desc terminal interface library" elif expr $name : ".*${CXX_NAME}.*" >/dev/null ; then diff --git a/misc/ncurses-config.in b/misc/ncurses-config.in index 10544081..e95227e3 100644 --- a/misc/ncurses-config.in +++ b/misc/ncurses-config.in @@ -1,5 +1,5 @@ #!@SHELL@ -# $Id: ncurses-config.in,v 1.39 2019/09/28 12:54:17 tom Exp $ +# $Id: ncurses-config.in,v 1.40 2019/10/05 22:24:20 tom Exp $ ############################################################################## # Copyright (c) 2006-2018,2019 Free Software Foundation, Inc. # # # @@ -86,7 +86,7 @@ if [ x@WITH_OVERWRITE@ = xno ]; then esac fi -LIBS="@LIBS@ @PRIVATE_LIBS@" +LIBS="@LIBS@" if [ "@TINFO_NAME@" = "@LIB_NAME@" ]; then LIBS="-l${THIS} $LIBS" else diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog index 383661a5..0113008b 100644 --- a/package/debian-mingw/changelog +++ b/package/debian-mingw/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20190928) unstable; urgency=low +ncurses6 (6.1+20191005) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 22 Sep 2019 14:43:59 -0400 + -- Thomas E. Dickey Sat, 05 Oct 2019 10:44:23 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog index 383661a5..0113008b 100644 --- a/package/debian-mingw64/changelog +++ b/package/debian-mingw64/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20190928) unstable; urgency=low +ncurses6 (6.1+20191005) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 22 Sep 2019 14:43:59 -0400 + -- Thomas E. Dickey Sat, 05 Oct 2019 10:44:23 -0400 ncurses6 (5.9-20131005) unstable; urgency=low diff --git a/package/debian/changelog b/package/debian/changelog index 953ec0f9..bb15b864 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (6.1+20190928) unstable; urgency=low +ncurses6 (6.1+20191005) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sun, 22 Sep 2019 14:43:59 -0400 + -- Thomas E. Dickey Sat, 05 Oct 2019 10:44:23 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi index 2c5242c8..ca9eae5f 100644 --- a/package/mingw-ncurses.nsi +++ b/package/mingw-ncurses.nsi @@ -1,4 +1,4 @@ -; $Id: mingw-ncurses.nsi,v 1.353 2019/09/27 18:43:59 tom Exp $ +; $Id: mingw-ncurses.nsi,v 1.354 2019/10/05 14:44:23 tom Exp $ ; TODO add examples ; TODO bump ABI to 6 @@ -10,7 +10,7 @@ !define VERSION_MAJOR "6" !define VERSION_MINOR "1" !define VERSION_YYYY "2019" -!define VERSION_MMDD "0928" +!define VERSION_MMDD "1005" !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD} !define MY_ABI "5" diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 0af8c296..a666beff 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Version: 6.1 -Release: 20190928 +Release: 20191005 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index cca5a1c9..ed83905d 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Version: 6.1 -Release: 20190928 +Release: 20191005 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz diff --git a/package/ncursest.spec b/package/ncursest.spec index 989481e6..6c7b9a03 100644 --- a/package/ncursest.spec +++ b/package/ncursest.spec @@ -1,7 +1,7 @@ Summary: Curses library with POSIX thread support. Name: ncursest6 Version: 6.1 -Release: 20190928 +Release: 20191005 License: X11 Group: Development/Libraries Source: ncurses-%{version}-%{release}.tgz -- 2.44.0