ncurses 5.7 - patch 20091017

+ modify handling of $PKG_CONFIG_LIBDIR to use only the first item in
  a possibly colon-separated list (Debian #550716).
This commit is contained in:
Thomas E. Dickey 2009-10-17 13:00:00 +00:00
parent 59108c98bd
commit 03cbf5c46f
4 changed files with 14 additions and 10 deletions

6
NEWS
View File

@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written -- -- sale, use or other dealings in this Software without prior written --
-- authorization. -- -- authorization. --
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
-- $Id: NEWS,v 1.1449 2009/10/10 20:41:36 tom Exp $ -- $Id: NEWS,v 1.1450 2009/10/17 12:41:17 tom Exp $
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started 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; Changes through 1.9.9e did not credit all contributions;
it is not possible to add this information. it is not possible to add this information.
20091017
+ modify handling of $PKG_CONFIG_LIBDIR to use only the first item in
a possibly colon-separated list (Debian #550716).
20091010 20091010
+ supply a null-terminator to buffer in _nc_viswibuf(). + supply a null-terminator to buffer in _nc_viswibuf().
+ fix a sign-extension bug in unget_wch() (report by Mike Gran). + fix a sign-extension bug in unget_wch() (report by Mike Gran).

6
configure vendored
View File

@ -1,5 +1,5 @@
#! /bin/sh #! /bin/sh
# From configure.in Revision: 1.474 . # From configure.in Revision: 1.475 .
# Guess values for system-dependent variables and create Makefiles. # Guess values for system-dependent variables and create Makefiles.
# Generated by Autoconf 2.52.20081225. # Generated by Autoconf 2.52.20081225.
# #
@ -3523,8 +3523,8 @@ echo $ECHO_N "checking if we should install .pc files for $PKG_CONFIG... $ECHO_C
if test -z "$PKG_CONFIG_LIBDIR" ; then if test -z "$PKG_CONFIG_LIBDIR" ; then
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[^/]*/[^/]*$,,'`/lib/pkgconfig
fi fi
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
if test -d "$PKG_CONFIG_LIBDIR" ; then if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
# Check whether --enable-pc-files or --disable-pc-files was given. # Check whether --enable-pc-files or --disable-pc-files was given.
if test "${enable_pc_files+set}" = set; then if test "${enable_pc_files+set}" = set; then

View File

@ -28,14 +28,14 @@ dnl***************************************************************************
dnl dnl
dnl Author: Thomas E. Dickey 1995-on dnl Author: Thomas E. Dickey 1995-on
dnl dnl
dnl $Id: configure.in,v 1.474 2009/09/26 22:36:43 tom Exp $ dnl $Id: configure.in,v 1.475 2009/10/17 12:38:32 tom Exp $
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl dnl
dnl See http://invisible-island.net/autoconf/ for additional information. dnl See http://invisible-island.net/autoconf/ for additional information.
dnl dnl
dnl --------------------------------------------------------------------------- dnl ---------------------------------------------------------------------------
AC_PREREQ(2.13.20020210) AC_PREREQ(2.13.20020210)
AC_REVISION($Revision: 1.474 $) AC_REVISION($Revision: 1.475 $)
AC_INIT(ncurses/base/lib_initscr.c) AC_INIT(ncurses/base/lib_initscr.c)
AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin) AC_CONFIG_HEADER(include/ncurses_cfg.h:include/ncurses_cfg.hin)
@ -169,8 +169,8 @@ if test "$PKG_CONFIG" != no ; then
if test -z "$PKG_CONFIG_LIBDIR" ; then if test -z "$PKG_CONFIG_LIBDIR" ; then
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG" | sed -e 's,/[[^/]]*/[[^/]]*$,,'`/lib/pkgconfig
fi fi
PKG_CONFIG_LIBDIR=`echo "$PKG_CONFIG_LIBDIR" | sed -e 's/^://' -e 's/:.*//'`
if test -d "$PKG_CONFIG_LIBDIR" ; then if test -n "$PKG_CONFIG_LIBDIR" && test -d "$PKG_CONFIG_LIBDIR" ; then
AC_ARG_ENABLE(pc-files, AC_ARG_ENABLE(pc-files,
[ --enable-pc-files generate and install .pc files for pkg-config], [ --enable-pc-files generate and install .pc files for pkg-config],
[enable_pc_files=$enableval], [enable_pc_files=$enableval],

View File

@ -25,7 +25,7 @@
# use or other dealings in this Software without prior written # # use or other dealings in this Software without prior written #
# authorization. # # authorization. #
############################################################################## ##############################################################################
# $Id: dist.mk,v 1.725 2009/10/10 15:29:50 tom Exp $ # $Id: dist.mk,v 1.726 2009/10/17 11:31:45 tom Exp $
# Makefile for creating ncurses distributions. # Makefile for creating ncurses distributions.
# #
# This only needs to be used directly as a makefile by developers, but # 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. # These define the major/minor/patch versions of ncurses.
NCURSES_MAJOR = 5 NCURSES_MAJOR = 5
NCURSES_MINOR = 7 NCURSES_MINOR = 7
NCURSES_PATCH = 20091010 NCURSES_PATCH = 20091017
# We don't append the patch to the version, since this only applies to releases # We don't append the patch to the version, since this only applies to releases
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)