ncurses 5.7 - patch 20090117
authorThomas E. Dickey <dickey@invisible-island.net>
Sun, 18 Jan 2009 00:21:12 +0000 (00:21 +0000)
committerThomas E. Dickey <dickey@invisible-island.net>
Sun, 18 Jan 2009 00:21:12 +0000 (00:21 +0000)
+ add -shared option to MK_SHARED_LIB when -Bsharable is used, for
  *BSD's, without which "main" might be one of the shared library's
  dependencies (report/analysis by Ken Dickey).
+ modify waddch_literal(), updating line-pointer after a multicolumn
  character is found to not fit on the current row, and wrapping is
  done.  Since the line-pointer was not updated, the wrapped
  multicolumn character was written to the beginning of the current row
  (cf: 20041023, reported by "Nick" regarding problem with ncmpc
  http://musicpd.org/mantis/bug_view_page.php?bug_id=1930).

NEWS
aclocal.m4
configure
dist.mk
ncurses/base/lib_addch.c

diff --git a/NEWS b/NEWS
index b7935d6d43ae24be2729414a96bf44112a7dca10..2d96145ee6ae30480f97a8d380dc3314794b8a21 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1356 2009/01/11 00:49:55 tom Exp $
+-- $Id: NEWS,v 1.1358 2009/01/17 23:54:20 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,17 @@ 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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20090117
+       + add -shared option to MK_SHARED_LIB when -Bsharable is used, for
+         *BSD's, without which "main" might be one of the shared library's
+         dependencies (report/analysis by Ken Dickey).
+       + modify waddch_literal(), updating line-pointer after a multicolumn
+         character is found to not fit on the current row, and wrapping is
+         done.  Since the line-pointer was not updated, the wrapped
+         multicolumn character was written to the beginning of the current row
+         (cf: 20041023, reported by "Nick" regarding problem with ncmpc
+         http://musicpd.org/mantis/bug_view_page.php?bug_id=1930).
+
 20090110
        + add screen.Eterm terminfo entry (GenToo #124887) -TD
        + modify adacurses-config to look for ".ali" files in the adalib
 20090110
        + add screen.Eterm terminfo entry (GenToo #124887) -TD
        + modify adacurses-config to look for ".ali" files in the adalib
index ca8eab62b86df80500fbf8a44ec8456de45fae53..3654cab62293ae0d018d8ad51abbbe7d628d6fb9 100644 (file)
@@ -28,7 +28,7 @@ dnl***************************************************************************
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
 dnl
 dnl Author: Thomas E. Dickey 1995-on
 dnl
-dnl $Id: aclocal.m4,v 1.481 2009/01/04 00:11:12 tom Exp $
+dnl $Id: aclocal.m4,v 1.482 2009/01/17 21:10:05 tom Exp $
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
 dnl Macros used in NCURSES auto-configuration script.
 dnl
 dnl These macros are maintained separately from NCURSES.  The copyright on
@@ -4279,7 +4279,7 @@ AC_MSG_RESULT(no)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_SHARED_OPTS version: 56 updated: 2009/01/03 19:10:38
+dnl CF_SHARED_OPTS version: 57 updated: 2009/01/17 16:10:05
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
 dnl --------------
 dnl --------------
 dnl Attempt to determine the appropriate CC/LD options for creating a shared
@@ -4450,7 +4450,7 @@ CF_EOF
                fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CF_SHARED_SONAME
                fi
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
+               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $[@]'
                ;;
        nto-qnx*|openbsd*|freebsd[[12]].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                ;;
        nto-qnx*|openbsd*|freebsd[[12]].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -4466,7 +4466,7 @@ CF_EOF
                        EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
                        EXTRA_LDFLAGS="-rpath \${libdir} $EXTRA_LDFLAGS"
                fi
                CF_SHARED_SONAME
-               MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $[@]` -o $[@]'
+               MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $[@]` -o $[@]'
                ;;
        netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                ;;
        netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -4485,7 +4485,7 @@ CF_EOF
                        CF_SHARED_SONAME
                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
                else
                        CF_SHARED_SONAME
                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $[@]'
                else
-                       MK_SHARED_LIB='${LD} -Bshareable -o $[@]'
+                       MK_SHARED_LIB='${LD} -shared -Bshareable -o $[@]'
                fi
                ;;
        osf*|mls+*)
                fi
                ;;
        osf*|mls+*)
index 465ea65a6b2178a98c561dc39865e97793861d84..6298b17084a65b26883bc2d44b2bf05a8528cbd7 100755 (executable)
--- a/configure
+++ b/configure
@@ -5393,7 +5393,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                cf_cv_shared_soname='`basename $@`'
        fi
 
                cf_cv_shared_soname='`basename $@`'
        fi
 
-               MK_SHARED_LIB='${CC} ${CFLAGS} -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
+               MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-Bshareable,-soname,'$cf_cv_shared_soname',-stats,-lc -o $@'
                ;;
        nto-qnx*|openbsd*|freebsd[12].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                ;;
        nto-qnx*|openbsd*|freebsd[12].*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -5416,7 +5416,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
                cf_cv_shared_soname='`basename $@`'
        fi
 
                cf_cv_shared_soname='`basename $@`'
        fi
 
-               MK_SHARED_LIB='${LD} -Bshareable -soname=`basename $@` -o $@'
+               MK_SHARED_LIB='${LD} -shared -Bshareable -soname=`basename $@` -o $@'
                ;;
        netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
                ;;
        netbsd*)
                CC_SHARED_OPTS="$CC_SHARED_OPTS -DPIC"
@@ -5442,7 +5442,7 @@ echo "${ECHO_T}$cf_cv_ldflags_search_paths_first" >&6
 
                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
                else
 
                        MK_SHARED_LIB='${CC} ${CFLAGS} -shared -Wl,-soname,'$cf_cv_shared_soname' -o $@'
                else
-                       MK_SHARED_LIB='${LD} -Bshareable -o $@'
+                       MK_SHARED_LIB='${LD} -shared -Bshareable -o $@'
                fi
                ;;
        osf*|mls+*)
                fi
                ;;
        osf*|mls+*)
diff --git a/dist.mk b/dist.mk
index 6ab5f000b20a24881e16082e77c8049d122f206e..c46b7705a8803fcd407e093e6cc50c9a07b5359a 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.682 2009/01/10 16:06:37 tom Exp $
+# $Id: dist.mk,v 1.683 2009/01/17 16:29:15 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # 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 = 7
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 7
-NCURSES_PATCH = 20090110
+NCURSES_PATCH = 20090117
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
index 3accc043d9bc0d528e74ad88db406d9e5d877f74..12aadd7a6911d4739e55430e3414de566a31688a 100644 (file)
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************
- * Copyright (c) 1998-2006,2008 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2008,2009 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            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -36,7 +36,7 @@
 #include <curses.priv.h>
 #include <ctype.h>
 
 #include <curses.priv.h>
 #include <ctype.h>
 
-MODULE_ID("$Id: lib_addch.c,v 1.114 2008/11/29 21:02:10 tom Exp $")
+MODULE_ID("$Id: lib_addch.c,v 1.115 2009/01/17 20:37:32 tom Exp $")
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
 
 static const NCURSES_CH_T blankchar = NewChar(BLANK_TEXT);
 
@@ -337,6 +337,7 @@ waddch_literal(WINDOW *win, NCURSES_CH_T ch)
                    return ERR;
                x = win->_curx;
                y = win->_cury;
                    return ERR;
                x = win->_curx;
                y = win->_cury;
+               line = win->_line + y;
            }
            /*
             * Check for cells which are orphaned by adding this character, set
            }
            /*
             * Check for cells which are orphaned by adding this character, set