mirror of
https://github.com/Aigor44/ncursesw-morphos.git
synced 2025-01-06 14:44:25 +08:00
ncurses 5.9 - patch 20121110
+ modify configure macro CF_INCLUDE_DIRS to put $CPPFLAGS after the local -I include options in case someone has set conflicting -I options in $CPPFLAGS (prompted by patch for ncurses/Makefile.in by Vassili Courzakis). + modify the ncurses*-config scripts to eliminate relative paths from the RPATH_LIST variable, e.g., "../lib" as used in installing shared libraries or executables.
This commit is contained in:
Thomas E. Dickey
parent
5ae2721913
commit
da2e96ef70
18
Ada95/aclocal.m4
vendored
18
Ada95/aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.60 2012/10/27 17:18:49 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.62 2012/11/11 00:18:37 tom Exp $
|
||||
dnl Macros used in NCURSES Ada95 auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -1548,7 +1548,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
|
||||
[AC_DIVERT_HELP([$1])dnl
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
|
||||
dnl CF_INCLUDE_DIRS version: 7 updated: 2012/11/10 19:15:05
|
||||
dnl ---------------
|
||||
dnl Construct the list of include-options according to whether we're building
|
||||
dnl in the source directory or using '--srcdir=DIR' option. If we're building
|
||||
@ -1556,21 +1556,21 @@ dnl with gcc, don't append the includedir if it happens to be /usr/include,
|
||||
dnl since that usually breaks gcc's shadow-includes.
|
||||
AC_DEFUN([CF_INCLUDE_DIRS],
|
||||
[
|
||||
CPPFLAGS="$CPPFLAGS -I. -I../include"
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
|
||||
fi
|
||||
if test "$GCC" != yes; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
elif test "$includedir" != "/usr/include"; then
|
||||
if test "$includedir" = '${prefix}/include' ; then
|
||||
if test $prefix != /usr ; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
fi
|
||||
else
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
fi
|
||||
fi
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
|
||||
fi
|
||||
CPPFLAGS="-I. -I../include $CPPFLAGS"
|
||||
AC_SUBST(CPPFLAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
14
Ada95/configure
vendored
14
Ada95/configure
vendored
@ -11815,21 +11815,21 @@ TINFO_LIBS=
|
||||
|
||||
### Construct the list of include-directories to be generated
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -I. -I../include"
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
|
||||
fi
|
||||
if test "$GCC" != yes; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
elif test "$includedir" != "/usr/include"; then
|
||||
if test "$includedir" = '${prefix}/include' ; then
|
||||
if test $prefix != /usr ; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
fi
|
||||
else
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
fi
|
||||
fi
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
|
||||
fi
|
||||
CPPFLAGS="-I. -I../include $CPPFLAGS"
|
||||
|
||||
ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
|
||||
if test "$srcdir" != "."; then
|
||||
|
||||
11
NEWS
11
NEWS
@ -25,7 +25,7 @@
|
||||
-- sale, use or other dealings in this Software without prior written --
|
||||
-- authorization. --
|
||||
-------------------------------------------------------------------------------
|
||||
-- $Id: NEWS,v 1.1971 2012/11/03 23:02:35 tom Exp $
|
||||
-- $Id: NEWS,v 1.1973 2012/11/10 21:44:29 tom Exp $
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This is a log of changes that ncurses has gone through since Zeyd started
|
||||
@ -45,6 +45,15 @@ 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.
|
||||
|
||||
20121110
|
||||
+ modify configure macro CF_INCLUDE_DIRS to put $CPPFLAGS after the
|
||||
local -I include options in case someone has set conflicting -I
|
||||
options in $CPPFLAGS (prompted by patch for ncurses/Makefile.in by
|
||||
Vassili Courzakis).
|
||||
+ modify the ncurses*-config scripts to eliminate relative paths from
|
||||
the RPATH_LIST variable, e.g., "../lib" as used in installing shared
|
||||
libraries or executables.
|
||||
|
||||
20121102
|
||||
+ realign these related pages:
|
||||
curs_add_wchstr.3x
|
||||
|
||||
18
aclocal.m4
vendored
18
aclocal.m4
vendored
@ -28,7 +28,7 @@ dnl***************************************************************************
|
||||
dnl
|
||||
dnl Author: Thomas E. Dickey 1995-on
|
||||
dnl
|
||||
dnl $Id: aclocal.m4,v 1.640 2012/11/03 19:39:23 tom Exp $
|
||||
dnl $Id: aclocal.m4,v 1.643 2012/11/11 00:17:28 tom Exp $
|
||||
dnl Macros used in NCURSES auto-configuration script.
|
||||
dnl
|
||||
dnl These macros are maintained separately from NCURSES. The copyright on
|
||||
@ -2716,7 +2716,7 @@ AC_DEFUN([CF_HELP_MESSAGE],
|
||||
[AC_DIVERT_HELP([$1])dnl
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
|
||||
dnl CF_INCLUDE_DIRS version: 7 updated: 2012/11/10 19:15:05
|
||||
dnl ---------------
|
||||
dnl Construct the list of include-options according to whether we're building
|
||||
dnl in the source directory or using '--srcdir=DIR' option. If we're building
|
||||
@ -2724,21 +2724,21 @@ dnl with gcc, don't append the includedir if it happens to be /usr/include,
|
||||
dnl since that usually breaks gcc's shadow-includes.
|
||||
AC_DEFUN([CF_INCLUDE_DIRS],
|
||||
[
|
||||
CPPFLAGS="$CPPFLAGS -I. -I../include"
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
|
||||
fi
|
||||
if test "$GCC" != yes; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
elif test "$includedir" != "/usr/include"; then
|
||||
if test "$includedir" = '${prefix}/include' ; then
|
||||
if test $prefix != /usr ; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
fi
|
||||
else
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
fi
|
||||
fi
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
|
||||
fi
|
||||
CPPFLAGS="-I. -I../include $CPPFLAGS"
|
||||
AC_SUBST(CPPFLAGS)
|
||||
])dnl
|
||||
dnl ---------------------------------------------------------------------------
|
||||
|
||||
14
configure
vendored
14
configure
vendored
@ -19460,21 +19460,21 @@ echo "${ECHO_T}$LIB_SUBSETS" >&6
|
||||
|
||||
### Construct the list of include-directories to be generated
|
||||
|
||||
CPPFLAGS="$CPPFLAGS -I. -I../include"
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
|
||||
fi
|
||||
if test "$GCC" != yes; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
elif test "$includedir" != "/usr/include"; then
|
||||
if test "$includedir" = '${prefix}/include' ; then
|
||||
if test $prefix != /usr ; then
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
fi
|
||||
else
|
||||
CPPFLAGS="$CPPFLAGS -I\${includedir}"
|
||||
CPPFLAGS="-I\${includedir} $CPPFLAGS"
|
||||
fi
|
||||
fi
|
||||
if test "$srcdir" != "."; then
|
||||
CPPFLAGS="-I\${srcdir}/../include $CPPFLAGS"
|
||||
fi
|
||||
CPPFLAGS="-I. -I../include $CPPFLAGS"
|
||||
|
||||
ACPPFLAGS="-I. -I../include -I../../include $ACPPFLAGS"
|
||||
if test "$srcdir" != "."; then
|
||||
|
||||
4
dist.mk
4
dist.mk
@ -25,7 +25,7 @@
|
||||
# use or other dealings in this Software without prior written #
|
||||
# authorization. #
|
||||
##############################################################################
|
||||
# $Id: dist.mk,v 1.899 2012/11/03 14:12:24 tom Exp $
|
||||
# $Id: dist.mk,v 1.900 2012/11/10 21:02:17 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 = 5
|
||||
NCURSES_MINOR = 9
|
||||
NCURSES_PATCH = 20121102
|
||||
NCURSES_PATCH = 20121110
|
||||
|
||||
# We don't append the patch to the version, since this only applies to releases
|
||||
VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!@SHELL@
|
||||
# $Id: ncurses-config.in,v 1.28 2012/08/11 21:45:20 tom Exp $
|
||||
# $Id: ncurses-config.in,v 1.30 2012/11/11 00:14:28 tom Exp $
|
||||
##############################################################################
|
||||
# Copyright (c) 2006-2010,2011 Free Software Foundation, Inc. #
|
||||
# Copyright (c) 2006-2011,2012 Free Software Foundation, Inc. #
|
||||
# #
|
||||
# Permission is hereby granted, free of charge, to any person obtaining a #
|
||||
# copy of this software and associated documentation files (the "Software"), #
|
||||
@ -30,6 +30,11 @@
|
||||
#
|
||||
# Author: Thomas E. Dickey, 2006-on
|
||||
|
||||
LANG=C; export LANG
|
||||
LANGUAGE=C; export LANGUAGE
|
||||
LC_ALL=C; export LC_ALL
|
||||
LC_CTYPE=C; export LC_CTYPE
|
||||
|
||||
prefix="@prefix@"
|
||||
exec_prefix="@exec_prefix@"
|
||||
|
||||
@ -44,10 +49,29 @@ THIS="@LIB_NAME@@DFT_ARG_SUFFIX@"
|
||||
TINFO_LIB="@TINFO_ARG_SUFFIX@"
|
||||
RPATH_LIST="@RPATH_LIST@"
|
||||
|
||||
LANG=C; export LANG
|
||||
LANGUAGE=C; export LANGUAGE
|
||||
LC_ALL=C; export LC_ALL
|
||||
LC_CTYPE=C; export LC_CTYPE
|
||||
# Ensure that RPATH_LIST contains only absolute pathnames, if it is nonempty.
|
||||
# We cannot filter it out within the build-process since the variable is used
|
||||
# in some special cases of installation using a relative path.
|
||||
if test -n "$RPATH_LIST"
|
||||
then
|
||||
save_IFS="$IFS"
|
||||
IFS='@PATH_SEPARATOR@'
|
||||
filtered=
|
||||
for item in $RPATH_LIST
|
||||
do
|
||||
case "$item" in
|
||||
./*|../*|*/..|*/../*)
|
||||
;;
|
||||
*)
|
||||
test -n "$filtered" && filtered="${filtered}@PATH_SEPARATOR@"
|
||||
filtered="${filtered}${item}"
|
||||
;;
|
||||
esac
|
||||
done
|
||||
IFS="$save_IFS"
|
||||
# if the result is empty, there is little we can do to fix it
|
||||
RPATH_LIST="$filtered"
|
||||
fi
|
||||
|
||||
# with --disable-overwrite, we installed into a subdirectory, but transformed
|
||||
# the headers to include like this:
|
||||
|
||||
@ -6,8 +6,8 @@
|
||||
# Report bugs and new terminal descriptions to
|
||||
# bug-ncurses@gnu.org
|
||||
#
|
||||
# $Revision: 1.469 $
|
||||
# $Date: 2012/11/03 18:58:05 $
|
||||
# $Revision: 1.470 $
|
||||
# $Date: 2012/11/04 15:59:03 $
|
||||
#
|
||||
# The original header is preserved below for reference. It is noted that there
|
||||
# is a "newer" version which differs in some cosmetic details (but actually
|
||||
@ -4826,7 +4826,7 @@ st-256color|simpleterm with 256 colors,
|
||||
ccc@,
|
||||
initc@, use=xterm+256color, use=simpleterm,
|
||||
|
||||
### TERMINATOR
|
||||
#### TERMINATOR
|
||||
# http://software.jessies.org/terminator/
|
||||
# Tested using their Debian package org.jessies.terminator 6.104.3256 on 64-bit
|
||||
# Debian/current -TD (2011/8/20)
|
||||
@ -22741,7 +22741,7 @@ v3220|LANPAR Vision II model 3220/3221/3222,
|
||||
# 2009-12-12
|
||||
# * updated nsterm* entries (Benjamin Sittler, Emanuele Giaquinta)
|
||||
#
|
||||
# 2009-12-12
|
||||
# 2009-12-19
|
||||
# * add bw (auto-left-margin) to nsterm* entries (Benjamin Sittler)
|
||||
# * rename minix to minix-1.7, add minix entry for Minux3 -TD
|
||||
#
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
ncurses6 (5.9-20121102) unstable; urgency=low
|
||||
ncurses6 (5.9-20121110) unstable; urgency=low
|
||||
|
||||
* latest weekly patch
|
||||
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 03 Nov 2012 15:21:53 -0400
|
||||
-- Thomas E. Dickey <dickey@invisible-island.net> Sat, 10 Nov 2012 16:02:42 -0500
|
||||
|
||||
ncurses6 (5.9-20120608) unstable; urgency=low
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: shared libraries for terminal handling
|
||||
Name: ncurses6
|
||||
Release: 5.9
|
||||
Version: 20121102
|
||||
Version: 20121110
|
||||
License: X11
|
||||
Group: Development/Libraries
|
||||
Source: ncurses-%{release}-%{version}.tgz
|
||||
|
||||
Loading…
Reference in New Issue
Block a user