From b2f192faabe412adce79534e22efe9fb69ee40e2 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 21 Jul 2006 10:10:31 +0000 Subject: Rename /openembedded/ -> /meta/ git-svn-id: https://svn.o-hand.com/repos/poky/trunk@530 311d38ba-8fff-0310-9ca6-ca027cbcb966 --- .../packages/ncurses/ncurses-native_5.4.bb | 6 - openembedded/packages/ncurses/ncurses.inc | 86 - .../packages/ncurses/ncurses/20030906.patch | 43248 ------------------- .../packages/ncurses/ncurses/configure.patch | 193 - .../packages/ncurses/ncurses/mk_shared_lib.patch | 27 - .../packages/ncurses/ncurses/run_tic.patch | 23 - openembedded/packages/ncurses/ncurses/tic.patch | 19 - .../packages/ncurses/ncurses/visibility.patch | 4904 --- openembedded/packages/ncurses/ncurses_5.4.bb | 7 - 9 files changed, 48513 deletions(-) delete mode 100644 openembedded/packages/ncurses/ncurses-native_5.4.bb delete mode 100644 openembedded/packages/ncurses/ncurses.inc delete mode 100644 openembedded/packages/ncurses/ncurses/20030906.patch delete mode 100644 openembedded/packages/ncurses/ncurses/configure.patch delete mode 100644 openembedded/packages/ncurses/ncurses/mk_shared_lib.patch delete mode 100644 openembedded/packages/ncurses/ncurses/run_tic.patch delete mode 100644 openembedded/packages/ncurses/ncurses/tic.patch delete mode 100644 openembedded/packages/ncurses/ncurses/visibility.patch delete mode 100644 openembedded/packages/ncurses/ncurses_5.4.bb (limited to 'openembedded/packages/ncurses') diff --git a/openembedded/packages/ncurses/ncurses-native_5.4.bb b/openembedded/packages/ncurses/ncurses-native_5.4.bb deleted file mode 100644 index 26d0897c9f..0000000000 --- a/openembedded/packages/ncurses/ncurses-native_5.4.bb +++ /dev/null @@ -1,6 +0,0 @@ -SECTION = "libs" -include ncurses_${PV}.bb -inherit native -EXTRA_OEMAKE = '"BUILD_CCFLAGS=${BUILD_CCFLAGS}"' -DEPENDS = "" -FILESPATH = "${FILE_DIRNAME}/local:${FILE_DIRNAME}/ncurses-${PV}-${PR}:${FILE_DIRNAME}/ncurses-${PV}:${FILE_DIRNAME}/ncurses:${FILE_DIRNAME}" diff --git a/openembedded/packages/ncurses/ncurses.inc b/openembedded/packages/ncurses/ncurses.inc deleted file mode 100644 index 030cd1034c..0000000000 --- a/openembedded/packages/ncurses/ncurses.inc +++ /dev/null @@ -1,86 +0,0 @@ -DESCRIPTION = "Ncurses library" -HOMEPAGE = "http://www.gnu.org/software/ncurses/ncurses.html" -LICENSE = "MIT" -SECTION = "libs" -DEPENDS = "ncurses-native" -PACKAGES_prepend = "ncurses-tools " -PACKAGES_append = " ncurses-terminfo" -FILES_ncurses_append = " ${datadir}/tabset" -RSUGGESTS_${PN} = "ncurses-terminfo" -RPROVIDES = "libncurses5" - -inherit autotools - -# This keeps only tput/tset in ncurses -# clear/reset are in already busybox -FILES_ncurses-tools = "${bindir}/tic ${bindir}/toe ${bindir}/infotocap ${bindir}/captoinfo ${bindir}/infocmp ${bindir}/clear.${PN} ${bindir}/reset.${PN} ${bindir}/tack " -FILES_ncurses-terminfo = "${datadir}/terminfo" -FILES_${PN} = "${bindir}/tput ${bindir}/tset ${libdir}/lib*.so.* usr/share/tabset etc/terminfo" - -PARALLEL_MAKE="" - -EXTRA_OECONF = "--with-shared \ - --without-profile \ - --without-debug \ - --disable-rpath \ - --enable-echo \ - --enable-const \ - --without-ada \ - --enable-termcap \ - --without-cxx-binding \ - --with-terminfo-dirs=${sysconfdir}/terminfo:${datadir}/terminfo \ - --enable-overwrite" -export BUILD_CCFLAGS = "-I${S}/ncurses -I${S}/include ${BUILD_CFLAGS}" -export BUILD_LDFLAGS = "" -export EXTRA_OEMAKE = '"BUILD_LDFLAGS=" "BUILD_CCFLAGS=${BUILD_CCFLAGS}"' - -do_stage() { - autotools_stage_all - ln -sf curses.h ${STAGING_INCDIR}/ncurses.h - ln -sf libncurses.so ${STAGING_LIBDIR}/libtermcap.so - ln -sf libncurses.a ${STAGING_LIBDIR}/libtermcap.a -} - -do_install() { - autotools_do_install - - # our ncurses has termcap support - ln -sf libncurses.so ${D}${libdir}/libtermcap.so - ln -sf libncurses.a ${D}${libdir}/libtermcap.a - - # include some basic terminfo files - # stolen ;) from gentoo and modified a bit - for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm-color xterm-xfree86 - do - local termfile="$(find "${D}${datadir}/terminfo/" -name "${x}" 2>/dev/null)" - local basedir="$(basename $(dirname "${termfile}"))" - - if [ -n "${termfile}" ] - then - install -d ${D}${sysconfdir}/terminfo/${basedir} - mv ${termfile} ${D}${sysconfdir}/terminfo/${basedir}/ - ln -s /etc/terminfo/${basedir}/${x} \ - ${D}${datadir}/terminfo/${basedir}/${x} - fi - done - # i think we can use xterm-color as default xterm - if [ -e ${D}${sysconfdir}/terminfo/x/xterm-color ] - then - ln -sf xterm-color ${D}${sysconfdir}/terminfo/x/xterm - fi - - mv ${D}${bindir}/clear ${D}${bindir}/clear.${PN} - mv ${D}${bindir}/reset ${D}${bindir}/reset.${PN} -} - - -pkg_postinst_ncurses-tools () { - update-alternatives --install ${bindir}/clear clear clear.${PN} 100 - update-alternatives --install ${bindir}/reset reset reset.${PN} 100 -} - - -pkg_prerm_ncurses-tools () { - update-alternatives --remove clear clear.${PN} - update-alternatives --remove reset reset.${PN} -} diff --git a/openembedded/packages/ncurses/ncurses/20030906.patch b/openembedded/packages/ncurses/ncurses/20030906.patch deleted file mode 100644 index f65dfafef1..0000000000 --- a/openembedded/packages/ncurses/ncurses/20030906.patch +++ /dev/null @@ -1,43248 +0,0 @@ -diff -urNd -urNd ncurses-5.3/ANNOUNCE ncurses-5.3.20030906.orig/ANNOUNCE ---- ncurses-5.3/ANNOUNCE Sat Oct 12 18:36:19 2002 -+++ ncurses-5.3.20030906.orig/ANNOUNCE Tue May 13 20:08:22 2003 -@@ -23,8 +23,8 @@ - manual pages are provided for the library and tools. - - The ncurses distribution is available via anonymous FTP at the GNU -- distribution site [1]ftp://ftp.gnu.org/pub/gnu/ncurses. -- It is also available at [2]ftp://invisible-island.net/ncurses. -+ distribution site [1]ftp://ftp.gnu.org/gnu/ncurses/ . -+ It is also available at [2]ftp://invisible-island.net/ncurses/ . - - Release Notes - -@@ -268,60 +268,60 @@ - - cdk - Curses Development Kit -- [3]http://invisible-island.net/cdk. -- [4]http://www.vexus.ca/CDK.html -+ [3]http://invisible-island.net/cdk/ -+ [4]http://www.vexus.ca/products/CDK/ - - ded - directory-editor -- [5]http://invisible-island.net/ded. -+ [5]http://invisible-island.net/ded/ - - dialog - the underlying application used in Slackware's setup, and the - basis for similar applications on GNU/Linux. -- [6]http://invisible-island.net/dialog. -+ [6]http://invisible-island.net/dialog/ - - lynx - the character-screen WWW browser -- [7]http://lynx.isc.org/release. -+ [7]http://lynx.isc.org/release/ - - Midnight Commander - file manager -- [8]www.gnome.org/mc/. -+ [8]http://www.ibiblio.org/mc/ - - mutt - mail utility -- [9]http://www.mutt.org. -+ [9]http://www.mutt.org/ - - ncftp - file-transfer utility -- [10]http://www.ncftp.com. -+ [10]http://www.ncftp.com/ - - nvi - New vi versions 1.50 are able to use ncurses versions 1.9.7 and - later. -- [11]http://www.bostic.com/vi/. -+ [11]http://www.bostic.com/vi/ - - tin - newsreader, supporting color, MIME -- [12]http://www.tin.org. -+ [12]http://www.tin.org/ - - taper - tape archive utility -- [13]http://members.iinet.net.au/~yusuf/taper/. -+ [13]http://taper.e-survey.net.au/ - - vh-1.6 - Volks-Hypertext browser for the Jargon File -- [14]http://www.bg.debian.org/Packages/unstable/text/vh.html. -+ [14]http://www.debian.org/Packages/unstable/text/vh.html - - as well as some that use ncurses for the terminfo support alone: - - minicom - terminal emulator -- [15]http://www.pp.clinet.fi/~walker/minicom.html. -+ [15]http://www.netsonic.fi/~walker/minicom.html - - vile - vi-like-emacs -- [16]http://invisible-island.net/vile. -+ [16]http://invisible-island.net/vile/ - - The ncurses distribution includes a selection of test programs - (including a few games). -@@ -342,7 +342,7 @@ - and testing of this package. - - Beta versions of ncurses and patches to the current release are made -- available at [23]ftp://invisible-island.net/ncurses. -+ available at [23]ftp://invisible-island.net/ncurses/ . - - Future Plans - -@@ -357,35 +357,35 @@ - - The distribution includes and uses a version of the terminfo-format - terminal description file maintained by Eric Raymond. -- [24]http://earthspace.net/~esr/terminfo. -+ [24]http://www.tuxedo.org/~esr/terminfo/ . - - You can find lots of information on terminal-related topics not -- covered in the terminfo file at [25]Richard Shuford's archive. -+ covered in the terminfo file at [25]Richard Shuford's archive . - - References - -- 1. ftp://ftp.gnu.org/pub/gnu/ncurses -- 2. ftp://invisible-island.net/ncurses -- 3. http://invisible-island.net/cdk/cdk.html -- 4. http://www.vexus.ca/CDK.html -- 5. http://invisible-island.net/ded/ded.html -- 6. http://invisible-island.net/dialog/dialog.html -+ 1. ftp://ftp.gnu.org/gnu/ncurses/ -+ 2. ftp://invisible-island.net/ncurses/ -+ 3. http://invisible-island.net/cdk/ -+ 4. http://www.vexus.ca/products/CDK/ -+ 5. http://invisible-island.net/ded/ -+ 6. http://invisible-island.net/dialog/ - 7. http://lynx.isc.org/release/ -- 8. file://localhost/usr/build/ncurses/ncurses-5.2-20021012/doc/html/www.gnome.org/mc/ -+ 8. http://www.ibiblio.org/mc/ - 9. http://www.mutt.org/ - 10. http://www.ncftp.com/ - 11. http://www.bostic.com/vi/ - 12. http://www.tin.org/ -- 13. http://members.iinet.net.au/~yusuf/taper/ -- 14. http://www.bg.debian.org/Packages/unstable/text/vh.html -- 15. http://www.pp.clinet.fi/~walker/minicom.html -- 16. http://invisible-island.net/vile/vile.html -+ 13. http://taper.e-survey.net.au/ -+ 14. http://www.debian.org/Packages/unstable/text/vh.html -+ 15. http://www.netsonic.fi/~walker/minicom.html -+ 16. http://invisible-island.net/vile/ - 17. mailto:zmbenhal@netcom.com -- 18. http://www.ccil.org/~esr/home.html -+ 18. http://www.tuxedo.org/~esr/ - 19. mailto:dickey@herndon4.his.com - 20. http://www.familiepfeifer.de/Contact.aspx?Lang=en - 21. mailto:dickey@herndon4.his.com - 22. mailto:bug-ncurses@gnu.org -- 23. ftp://invisible-island.net/ncurses -- 24. http://earthspace.net/~esr/terminfo -+ 23. ftp://invisible-island.net/ncurses/ -+ 24. http://www.tuxedo.org/~esr/terminfo/ - 25. http://www.cs.utk.edu/~shuford/terminal_index.html -diff -urNd -urNd ncurses-5.3/Ada95/gen/Makefile.in ncurses-5.3.20030906.orig/Ada95/gen/Makefile.in ---- ncurses-5.3/Ada95/gen/Makefile.in Sat Jul 13 07:02:28 2002 -+++ ncurses-5.3.20030906.orig/Ada95/gen/Makefile.in Tue May 13 20:08:22 2003 -@@ -1,5 +1,5 @@ - ############################################################################## --# Copyright (c) 1998 Free Software Foundation, Inc. # -+# Copyright (c) 1998-2002,2003 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,7 +30,7 @@ - # Contact: http://www.familiepfeifer.de/Contact.aspx?Lang=en - # - # Version Control --# $Revision: 1.41 $ -+# $Revision: 1.43 $ - # - .SUFFIXES: - -@@ -53,6 +53,7 @@ - AWK = @AWK@ - LN_S = @LN_S@ - -+CC = @CC@ - HOST_CC = @BUILD_CC@ - CFLAGS = @CFLAGS@ - -@@ -171,9 +172,9 @@ - install \ - install.libs :: $(ADA_OBJECTS) - @echo installing package $(ALIB) in $(ADA_OBJECTS) -- @chmod a-wx $(ADA_SRCDIR)/*.ali -+ @-chmod a-wx $(ADA_SRCDIR)/*.ali - @$(top_srcdir)/tar-copy.sh '$(ALIB)[-.]*.ali' $(ADA_SRCDIR) $(ADA_OBJECTS) -- @chmod u+x $(ADA_SRCDIR)/*.ali -+ @-chmod u+x $(ADA_SRCDIR)/*.ali - - uninstall \ - uninstall.libs :: -diff -urNd -urNd ncurses-5.3/Ada95/src/Makefile.in ncurses-5.3.20030906.orig/Ada95/src/Makefile.in ---- ncurses-5.3/Ada95/src/Makefile.in Sat Jul 13 07:02:23 2002 -+++ ncurses-5.3.20030906.orig/Ada95/src/Makefile.in Tue May 13 20:08:22 2003 -@@ -30,7 +30,7 @@ - # Contact: http://www.familiepfeifer.de/Contact.aspx?Lang=en - # - # Version Control --# $Revision: 1.26 $ -+# $Revision: 1.27 $ - # - .SUFFIXES: - -@@ -214,19 +214,19 @@ - - - $(ABASE)-terminfo.o: \ -- $(ABASE)-terminfo.ads \ -+ $(srcdir)/$(ABASE)-terminfo.ads \ - $(srcdir)/$(ABASE)-terminfo.adb $(BASEDEPS) - $(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ABASE)-terminfo.adb - - - $(ABASE)-termcap.o: \ -- $(ABASE)-termcap.ads \ -+ $(srcdir)/$(ABASE)-termcap.ads \ - $(srcdir)/$(ABASE)-termcap.adb $(BASEDEPS) - $(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ABASE)-termcap.adb - - - $(ABASE)-putwin.o: \ -- $(ABASE)-putwin.ads \ -+ $(srcdir)/$(ABASE)-putwin.ads \ - $(srcdir)/$(ABASE)-putwin.adb $(BASEDEPS) - $(ADA) $(ADAFLAGS) -c -o $@ $(srcdir)/$(ABASE)-putwin.adb - -diff -urNd -urNd ncurses-5.3/INSTALL ncurses-5.3.20030906.orig/INSTALL ---- ncurses-5.3/INSTALL Sun Sep 1 17:42:11 2002 -+++ ncurses-5.3.20030906.orig/INSTALL Fri Sep 12 16:42:40 2003 -@@ -1,4 +1,4 @@ ---- $Id: INSTALL,v 1.56 2002/09/01 22:42:11 tom Exp $ -+-- $Id: INSTALL,v 1.65 2003/08/30 22:44:10 tom Exp $ - --------------------------------------------------------------------- - How to install Ncurses/Terminfo on your system - --------------------------------------------------------------------- -@@ -168,6 +168,11 @@ - databases are SVr4-compatible, but most seem to be. Exceptions include - DEC's Digital Unix (formerly known as OSF/1). - -+ If you run the test programs WITHOUT installing terminfo, ncurses may -+ read the termcap file and cache that in $HOME/.terminfo, which will -+ thereafter be used instead of the terminfo database. See the comments -+ on "--enable-getcap-cache", to see why this is a Bad Thing. -+ - It is possible to configure ncurses to use other terminfo database formats. - A few are provided as examples in the include-directory (see --with-caps). - -@@ -312,10 +317,6 @@ - Compile without scroll-hints code. This option is ignored when - hashmap scrolling is configured, which is the default. - -- --enable-add-ons=DIR... -- This is used to check if this package is a glibc add-on. This is used -- only by the glibc makefiles. -- - --enable-assertions - For testing, compile-in assertion code. This is used only for a few - places where ncurses cannot easily recover by returning an error code. -@@ -454,6 +455,11 @@ - --enable-xmc-glitch - Compile-in support experimental xmc (magic cookie) code. - -+ --with-abi-version=NUM -+ Override the ABI version, which is used in shared library filenames. -+ Normally this is the same as the release version; some ports have -+ special requirements for compatibility. -+ - --with-ada-compiler=CMD - Specify the Ada95 compiler command (default "gnatmake") - -@@ -472,7 +478,7 @@ - - --with-build-cc=XXX - If cross-compiling, specify a host C compiler, which is needed to -- compile a few utilties which generate source modules for ncurses. -+ compile a few utilities which generate source modules for ncurses. - If you do not give this option, the configure script checks if the - $BUILD_CC variable is set, and otherwise defaults to gcc or cc. - -@@ -482,7 +488,7 @@ - host compiler. - - --with-build-cppflags=XXX -- If cross-compiling, specify the host C preprocesor-flags. You might -+ If cross-compiling, specify the host C preprocessor-flags. You might - need to do this if the target compiler has unusual flags which confuse - the host compiler. - -@@ -544,9 +550,17 @@ - NOTE: a few systems build shared libraries with fixed pathnames; this - option probably will not work for those configurations. - -- --with-libtool -- Generate libraries with libtool. If this option is selected, then -- it overrides all other library model specifications. -+ --with-libtool[=XXX] -+ Generate libraries with libtool. If this option is selected, then it -+ overrides all other library model specifications. Note that libtool -+ must already be installed, uses makefile rules dependent on GNU make, -+ and does not promise to follow the version numbering convention of -+ other shared libraries on your system. However, if the --with-shared -+ option does not succeed, you may get better results with this option. -+ -+ If a parameter value is given, it must be the full pathname of the -+ particular version of libtool, e.g., -+ /usr/bin/libtool-1.2.3 - - --with-manpage-format=XXX - Tell the configure script how you would like to install man-pages. The -@@ -609,6 +623,9 @@ - This is normally chosen automatically based on the type of system - which you are building on. We use it for testing the configure script. - -+ --with-sysmouse -+ use FreeBSD sysmouse interface provide mouse support on the console. -+ - --with-system-type=XXX - For testing, override the derived host system-type which is used to - decide things such as the linker commands used to build shared -@@ -673,7 +690,7 @@ - you may encounter when building a system with different versions of - ncurses: - -- 5.3 (pre-release) -+ 5.3 (October 12, 2002) - Interface changes: - - + change type for bool used in headers to NCURSES_BOOL, which usually -@@ -895,31 +912,34 @@ - IF YOU ARE A SYSTEM INTEGRATOR: - ------------------------------ - -- Beginning with 1.9.9, the ncurses distribution includes both a tset -- utility and /usr/share/tabset directory. If you are installing ncurses, -- it is no longer either necessary or desirable to install tset-jv. -- - Configuration and Installation: - -- Configure with --prefix=/usr to make the install productions put -- libraries and headers in the correct locations (overwriting any -- previous curses libraries and headers). This will put the terminfo -- hierarchy under /usr/share/terminfo; you may want to override this with -- --datadir=/usr/share/misc; terminfo and tabset are installed under the -- data directory. -+ On platforms where ncurses is assumed to be installed in /usr/lib, -+ the configure script uses "/usr" as a default: - -- Please configure the ncurses library in a pure-terminfo mode; that -- is, with the --disable-termcap option. This will make the ncurses -- library smaller and faster. The ncurses library includes a termcap -- emulation that queries the terminfo database, so even applications -- that use raw termcap to query terminal characteristics will win -- (providing you recompile and relink them!). -+ Linux, FreeBSD, NetBSD, OpenBSD, Cygwin - -- If you must configure with termcap fallback enabled, you may also -- wish to use the --enable-getcap option. This option speeds up -- termcap-based startups, at the expense of not allowing personal -- termcap entries to reference the terminfo tree. See the code in -- ncurses/tinfo/read_termcap.c for details. -+ For other platforms, the default is "/usr/local". See the discussion -+ of the "--disable-overwrite" option. -+ -+ The location of the terminfo is set indirectly by the "--datadir" -+ configure option, e.g., /usr/share/terminfo, given a datadir of -+ /usr/share. You may want to override this if you are installing -+ ncurses libraries in nonstandard locations, but wish to share the -+ terminfo database. -+ -+ Normally the ncurses library is configured in a pure-terminfo mode; -+ that is, with the --disable-termcap option. This makes the ncurses -+ library smaller and faster. The ncurses library includes a termcap -+ emulation that queries the terminfo database, so even applications that -+ use raw termcap to query terminal characteristics will win (providing -+ you recompile and relink them!). -+ -+ If you must configure with termcap fallback enabled, you may also wish -+ to use the --enable-getcap option. This speeds up termcap-based -+ startups, at the expense of not allowing personal termcap entries to -+ reference the terminfo tree. See comments in -+ ncurses/tinfo/read_termcap.c for further details. - - Note that if you have $TERMCAP set, ncurses will use that value - to locate termcap data. In particular, running from xterm will -@@ -939,11 +959,11 @@ - - Naming the Console Terminal - -- In various Linuxes (and possibly elsewhere) there has been a practice -- of designating the system console driver type as `console'. Please -- do not do this any more! It complicates peoples' lives, because it -- can mean that several different terminfo entries from different -- operating systems all logically want to be called `console'. -+ In various systems there has been a practice of designating the system -+ console driver type as `console'. Please do not do this! It -+ complicates peoples' lives, because it can mean that several different -+ terminfo entries from different operating systems all logically want to -+ be called `console'. - - Please pick a name unique to your console driver and set that up - in the /etc/inittab table or local equivalent. Send the entry to the -diff -urNd -urNd ncurses-5.3/MANIFEST ncurses-5.3.20030906.orig/MANIFEST ---- ncurses-5.3/MANIFEST Sun Sep 1 17:08:22 2002 -+++ ncurses-5.3.20030906.orig/MANIFEST Sun Jul 20 14:02:09 2003 -@@ -166,13 +166,11 @@ - ./Ada95/src/terminal_interface.ads - ./INSTALL - ./MANIFEST --./Makefile.glibc - ./Makefile.in - ./Makefile.os2 - ./NEWS - ./README - ./README.emx --./README.glibc - ./TO-DO - ./aclocal.m4 - ./announce.html.in -@@ -394,6 +392,7 @@ - ./doc/html/man/form_win.3x.html - ./doc/html/man/infocmp.1m.html - ./doc/html/man/infotocap.1m.html -+./doc/html/man/key_defined.3x.html - ./doc/html/man/keybound.3x.html - ./doc/html/man/keyok.3x.html - ./doc/html/man/menu.3x.html -@@ -593,6 +592,7 @@ - ./man/form_win.3x - ./man/infocmp.1m - ./man/infotocap.1m -+./man/key_defined.3x - ./man/keybound.3x - ./man/keyok.3x - ./man/make_sed.sh -@@ -673,6 +673,7 @@ - ./misc/chkdef.cmd - ./misc/cleantic.cmd - ./misc/cmpdef.cmd -+./misc/csort - ./misc/emx.src - ./misc/form.def - ./misc/form.ref -@@ -706,6 +707,7 @@ - ./ncurses/base/MKunctrl.awk - ./ncurses/base/README - ./ncurses/base/define_key.c -+./ncurses/base/key_defined.c - ./ncurses/base/keybound.c - ./ncurses/base/keyok.c - ./ncurses/base/lib_addch.c -@@ -736,7 +738,6 @@ - ./ncurses/base/lib_initscr.c - ./ncurses/base/lib_insch.c - ./ncurses/base/lib_insdel.c --./ncurses/base/lib_insstr.c - ./ncurses/base/lib_instr.c - ./ncurses/base/lib_isendwin.c - ./ncurses/base/lib_leaveok.c -@@ -861,6 +862,7 @@ - ./ncurses/tty/tty_display.h - ./ncurses/tty/tty_input.h - ./ncurses/tty/tty_update.c -+./ncurses/widechar/charable.c - ./ncurses/widechar/lib_box_set.c - ./ncurses/widechar/lib_cchar.c - ./ncurses/widechar/lib_erasewchar.c -@@ -869,9 +871,9 @@ - ./ncurses/widechar/lib_hline_set.c - ./ncurses/widechar/lib_in_wch.c - ./ncurses/widechar/lib_in_wchnstr.c --./ncurses/widechar/lib_ins_nwstr.c - ./ncurses/widechar/lib_ins_wch.c - ./ncurses/widechar/lib_inwstr.c -+./ncurses/widechar/lib_slk_wset.c - ./ncurses/widechar/lib_unget_wch.c - ./ncurses/widechar/lib_vid_attr.c - ./ncurses/widechar/lib_vline_set.c -@@ -913,12 +915,6 @@ - ./progs/toe.c - ./progs/tput.c - ./progs/tset.c --./sysdeps/unix/sysv/linux/Makefile --./sysdeps/unix/sysv/linux/alpha/configure --./sysdeps/unix/sysv/linux/configure --./sysdeps/unix/sysv/linux/edit_man.sed --./sysdeps/unix/sysv/linux/edit_man.sh --./sysdeps/unix/sysv/linux/run_tic.sh - ./tack/COPYING - ./tack/HISTORY - ./tack/Makefile.in -@@ -945,6 +941,7 @@ - ./tar-copy.sh - ./test/Makefile.in - ./test/README -+./test/aclocal.m4 - ./test/blue.c - ./test/bs.6 - ./test/bs.c -@@ -952,8 +949,15 @@ - ./test/cardfile.dat - ./test/configure - ./test/configure.in -+./test/demo_defkey.c -+./test/demo_forms.c -+./test/demo_keyok.c -+./test/demo_menus.c -+./test/demo_panels.c - ./test/ditto.c - ./test/dots.c -+./test/edit_field.c -+./test/edit_field.h - ./test/filter.c - ./test/firework.c - ./test/firstlast.c -@@ -961,8 +965,11 @@ - ./test/gdc.c - ./test/hanoi.c - ./test/hashtest.c -+./test/ins_wide.c -+./test/inserts.c - ./test/keynames.c - ./test/knight.c -+./test/listused.sh - ./test/lrtest.c - ./test/modules - ./test/ncurses.c -diff -urNd -urNd ncurses-5.3/NEWS ncurses-5.3.20030906.orig/NEWS ---- ncurses-5.3/NEWS Sat Oct 12 17:35:42 2002 -+++ ncurses-5.3.20030906.orig/NEWS Fri Sep 12 16:42:59 2003 -@@ -1,4 +1,4 @@ ---- $Id: NEWS,v 1.714 2002/10/12 22:35:42 tom Exp $ -+-- $Id: NEWS,v 1.766 2003/09/06 22:40:56 tom Exp $ - - This is a log of changes that ncurses has gone through since Zeyd started - working with Pavel Curtis' original work, pcurses, in 1992. -@@ -6,6 +6,531 @@ - Changes through 1.9.9e are recorded by Zeyd M. Ben-Halim. - Changes since 1.9.9e are recorded by Thomas Dickey. - -+20030906 -+ + modify configure script to avoid using "head -1", which does not -+ work if POSIXLY_CORRECT (sic) is set. -+ + modify run_tic.in to avoid using wrong shared libraries when -+ cross-compiling (Dan Kegel). -+ -+20030830 -+ + alter configure script help message to make it clearer that -+ --with-build-cc does not specify a cross-compiler (suggested by Dan -+ Kegel ). -+ + modify configure script to accommodate libtool 1.5, as well as add an -+ parameter to the "--with-libtool" option which can specify the -+ pathname of libtool (report by Chris Zubrzycki). We note that -+ libtool 1.5 has more than one bug in its C++ support, so it is not -+ able to install libncurses++, for instance, if $DESTDIR or the option -+ --with-install-prefix is used. -+ -+20030823 -+ > Philippe Blain: -+ + move assignments to SP->_cursrow, SP->_curscol into online_mvcur(). -+ + make baudrate computation in delay_output() consistent with the -+ assumption in _nc_mvcur_init(), i.e., a byte is 9 bits. -+ -+20030816 -+ + modify logic in waddch_literal() to take into account zh_TW.Big5 -+ whose multibyte sequences may contain "printable" characters, e.g., -+ a "g" in the sequence "\247g" (Debian #204889, cf: 20030621). -+ + improve storage used by _nc_safe_strcpy() by ensuring that the size -+ is reset based on the initialization call, in case it were called -+ after other strcpy/strcat calls (report by Philippe Blain). -+ > Philippe Blain: -+ + remove an unused ifdef for REAL_ATTR & WANT_CHAR -+ + correct a place where _cup_cost was used rather than _cuu_cost -+ -+20030809 -+ + fix a small memory leak in _nc_free_termtype(). -+ + close trace-file if trace() is called with a zero parameter. -+ + free memory allocated for soft-key strings, in delscreen(). -+ + fix an allocation size in safe_sprintf.c for the "*" format code. -+ + correct safe_sprintf.c to not return a null pointer if the format -+ happens to be an empty string. This applies to the "configure -+ --enable-safe-sprintf" option (Redhat #101486). -+ -+20030802 -+ + modify casts used for ABSENT_BOOLEAN and CANCELLED_BOOLEAN (report by -+ Daniel Jacobowitz). -+ > Philippe Blain: -+ + change padding for change_scroll_region to not be proportional to -+ the size of the scroll-region. -+ + correct error-return in _nc_safe_strcat(). -+ -+20030726 -+ + correct limit-checks in _nc_scroll_window() (report and test-case by -+ Thomas Graf cf: 20011020). -+ + re-order configure checks for _XOPEN_SOURCE to avoid conflict with -+ _GNU_SOURCE check. -+ -+20030719 -+ + use clr_eol in preference to blanks for bce terminals, so select and -+ paste will have fewer trailing blanks, e.g., when using xterm -+ (request by Vincent Lefevre). -+ + correct prototype for wunctrl() in manpage. -+ + add configure --with-abi-version option (discussion with Charles -+ Wilson). -+ > cygwin changes from Charles Wilson: -+ + aclocal.m4: on cygwin, use autodetected prefix for import -+ and static lib, but use "cyg" for DLL. -+ + include/ncurses_dll.h: correct the comments to reflect current -+ status of cygwin/mingw port. Fix compiler warning. -+ + misc/run_tic.in: ensure that tic.exe can find the uninstalled -+ DLL, by adding the lib-directory to the PATH variable. -+ + misc/terminfo.src (nxterm|xterm-color): make xterm-color -+ primary instead of nxterm, to match XFree86's xterm.terminfo -+ usage and to prevent circular links. -+ (rxvt): add additional codes from rxvt.org. -+ (rxvt-color): new alias -+ (rxvt-xpm): new alias -+ (rxvt-cygwin): like rxvt, but with special acsc codes. -+ (rxvt-cygwin-native): ditto. rxvt may be run under XWindows, or -+ with a "native" MSWin GUI. Each takes different acsc codes, -+ which are both different from the "normal" rxvt's acsc. -+ (cygwin): cygwin-in-cmd.exe window. Lots of fixes. -+ (cygwinDBG): ditto. -+ + mk-1st.awk: use "cyg" for the DLL prefix, but "lib" for import -+ and static libs. -+ -+20030712 -+ + update config.guess, config.sub -+ + add triples for configuring shared libraries with the Debian -+ GNU/FreeBSD packages (patch by Robert Millan ). -+ -+20030705 -+ + modify CF_GCC_WARNINGS so it only applies to gcc, not g++. Some -+ platforms have installed g++ along with the native C compiler, which -+ would not accept gcc warning options. -+ + add -D_XOPEN_SOURCE=500 when configuring with --enable-widec, to -+ get mbstate_t declaration on HPUX 11.11 (report by David Ellement). -+ + add _nc_pathlast() to get rid of casts in _nc_basename() calls. -+ + correct a sign-extension in wadd_wch() and wecho_wchar() from -+ 20030628 (report by Tomohiro KUBOTA). -+ + work around omission of btowc() and wctob() from wide-character -+ support (sic) in NetBSD 1.6 using mbtowc() and wctomb() (report by -+ Gabor Z Papp). -+ + add portability note to curs_get_wstr.3x (Debian #199957). -+ -+20030628 -+ + rewrite wadd_wch() and wecho_wchar() to call waddch() and wechochar() -+ respectively, to avoid calling waddch_noecho() with wide-character -+ data, since that function assumes its input is 8-bit data. -+ Similarly, modify waddnwstr() to call wadd_wch(). -+ + remove logic from waddnstr() which transformed multibyte character -+ strings into wide-characters. Rewrite of waddch_literal() from -+ 20030621 assumes its input is raw multibyte data rather than wide -+ characters (report by Tomohiro KUBOTA). -+ -+20030621 -+ + write getyx() and related 2-return macros in terms of getcury(), -+ getcurx(), etc. -+ + modify waddch_literal() in case an application passes bytes of a -+ multibyte character directly to waddch(). In this case, waddch() -+ must reassemble the bytes into a wide-character (report by Tomohiro -+ KUBOTA ). -+ -+20030614 -+ + modify waddch_literal() in case a multibyte value occupies more than -+ two cells. -+ + modify PutAttrChar() to compute the number of character cells that -+ are used in multibyte values. This fixes a problem displaying -+ double-width characters (report/test by Mitsuru Chinen -+ ). -+ + add a null-pointer check for result of keyname() in _tracechar() -+ + modify _tracechar() to work around glibc sprintf bug. -+ -+20030607 -+ + add a call to setlocale() in cursesmain.cc, making demo display -+ properly in a UTF-8 locale. -+ + add a fallback definition in curses.priv.h for MB_LEN_MAX (prompted -+ by discussion with Gabor Z Papp). -+ + use macros NCURSES_ACS() and NCURSES_WACS() to hide cast needed to -+ appease -Wchar-subscript with g++ 3.3 (Debian #195732). -+ + fix a redefinition of $RANLIB in the configure script when libtool -+ is used, which broke configure on Mac OS X (report by Chris Zubrzycki -+ ). -+ + simplify ifdef for bool declaration in curses.h.in (suggested by -+ Albert Chin-A-Young). -+ + remove configure script check to allow -Wconversion for older -+ versions of gcc (suggested by Albert Chin-A-Young). -+ -+20030531 -+ + regenerated html manpages. -+ + modify ifdef's in curses.h.in that disabled use of __attribute__() -+ for g++, since recent versions implement the cases which ncurses uses -+ (Debian #195230). -+ + modify _nc_get_token() to handle a case where an entry has no -+ description, and capabilities begin on the same line as the entry -+ name. -+ + fix a typo in ncurses_dll.h reported by gcc 3.3. -+ + add an entry for key_defined.3x to man_db.renames. -+ -+20030524 -+ + modify setcchar() to allow converting control characters to complex -+ characters (report/test by Mitsuru Chinen ). -+ + add tkterm entry -TD -+ + modify parse_entry.c to allow a terminfo entry with a leading -+ 2-character name (report by Don Libes). -+ + corrected acsc in screen.teraterm, which requires a PC-style mapping. -+ + fix trace statements in read_entry.c to use lseek() rather than -+ tell(). -+ + fix signed/unsigned warnings from Sun's compiler (gcc should give -+ these warnings, but it is unpredictable). -+ + modify configure script to omit -Winline for gcc 3.3, since that -+ feature is broken. -+ + modify manlinks.sed to add a few functions that were overlooked since -+ they return function pointers: field_init, field_term, form_init, -+ form_term, item_init, item_term, menu_init and menu_term. -+ -+20030517 -+ + prevent recursion in wgetch() via wgetnstr() if the connection cannot -+ be switched between cooked/raw modes because it is not a TTY (report -+ by Wolfgang Gutjahr ). -+ + change parameter of define_key() and key_defined() to const (prompted -+ by Debian #192860). -+ + add a check in test/configure for ncurses extensions, since there -+ are some older versions, etc., which would not compile with the -+ current test programs. -+ + corrected demo in test/ncurses.c of wgetn_wstr(), which did not -+ convert wchar_t string to multibyte form before printing it. -+ + corrections to lib_get_wstr.c: -+ + null-terminate buffer passed to setcchar(), which occasionally -+ failed. -+ + map special characters such as erase- and kill-characters into -+ key-codes so those will work as expected even if they are not -+ mentioned in the terminfo. -+ + modify PUTC() and Charable() macros to make wide-character line -+ drawing work for POSIX locale on Linux console (cf: 20021221). -+ -+20030510 -+ + make typography for program options in manpages consistent (report -+ by Miloslav Trmac ). -+ + correct dependencies in Ada95/src/Makefile.in, so the builds with -+ "--srcdir" work (report by Warren L Dodge). -+ + correct missing definition of $(CC) in Ada95/gen/Makefile.in -+ (reported by Warren L Dodge ). -+ + fix typos and whitespace in manpages (patch by jmc -+ ). -+ -+20030503 -+ + fix form_driver() cases for REQ_CLR_EOF, REQ_CLR_EOL, REQ_DEL_CHAR, -+ REQ_DEL_PREV and REQ_NEW_LINE, which did not ensure the cursor was at -+ the editing position before making modifications. -+ + add test/demo_forms and associated test/edit_field.c demos. -+ + modify test/configure.in to use test/modules for the list of objects -+ to compile rather than using the list of programs. -+ -+20030419 -+ + modify logic of acsc to use the original character if no mapping is -+ defined, noting that Solaris does this. -+ + modify ncurses 'b' test to avoid using the acs_map[] array since -+ 20021231 changes it to no longer contain information from the acsc -+ string. -+ + modify makefile rules in c++, progs, tack and test to ensure that -+ the compiler flags (e.g., $CFLAGS or $CCFLAGS) are used in the link -+ command (report by Jose Luis Rico Botella ). -+ + modify soft-key initialization to use A_REVERSE if A_STANDOUT would -+ not be shown when colors are used, i.e., if ncv#1 is set in the -+ terminfo as is done in "screen". -+ -+20030412 -+ + add a test for slk_color(), in ncurses.c -+ + fix some issues reported by valgrind in the slk_set() and slk_wset() -+ code, from recent rewrite. -+ + modify ncurses 'E' test to use show previous label via slk_label(), -+ as in 'e' test. -+ + modify wide-character versions of NewChar(), NewChar2() macros to -+ ensure that the whole struct is initialized. -+ -+20030405 -+ + modify setupterm() to check if the terminfo and terminal-modes have -+ already been read. This ensures that it does not reinvoke -+ def_prog_mode() when an application calls more than one function, -+ such as tgetent() and initscr() (report by Olaf Buddenhagen). -+ -+20030329 -+ + add 'E' test to ncurses.c, to exercise slk_wset(). -+ + correct handling of carriage-return in wgetn_wstr(), used in demo of -+ slk_wset(). -+ + first draft of slk_wset() function. -+ -+20030322 -+ + improved warnings in tic when suppressing items to fit in termcap's -+ 1023-byte limit. -+ + built a list in test/README showing which externals are being used -+ by either programs in the test-directory or via internal library -+ calls. -+ + adjust include-options in CF_ETIP_DEFINES to avoid missing -+ ncurses_dll.h, fixing special definitions that may be needed for -+ etip.h (reported by Greg Schafer ). -+ -+20030315 -+ + minor fixes for cardfile.c, to make it write the updated fields to -+ a file when ^W is given. -+ + add/use _nc_trace_bufcat() to eliminate some fixed buffer limits in -+ trace code. -+ -+20030308 -+ + correct a case in _nc_remove_string(), used by define_key(), to avoid -+ infinite loop if the given string happens to be a substring of other -+ strings which are assigned to keys (report by John McCutchan). -+ + add key_defined() function, to tell which keycode a string is bound -+ to (discussion with John McCutchan ). -+ + correct keybound(), which reported definitions in the wrong table, -+ i.e., the list of definitions which are disabled by keyok(). -+ + modify demo_keydef.c to show the details it changes, and to check -+ for errors. -+ -+20030301 -+ + restructured test/configure script, make it work for libncursesw. -+ + add description of link_fieldtype() to manpage (report by -+ L Dee Holtsclaw ). -+ -+20030222 -+ + corrected ifdef's relating to configure check for wchar_t, etc. -+ + if the output is a socket or other non-tty device, use 1 millisecond -+ for the cost in mvcur; previously it was 9 milliseconds because the -+ baudrate was not known. -+ + in _nc_get_tty_mode(), initialize the TTY buffer on error, since -+ glibc copies uninitialized data in that case, as noted by valgrind. -+ + modify tput to use the same parameter analysis as tparm() does, to -+ provide for user-defined strings, e.g., for xterm title, a -+ corresponding capability might be -+ title=\E]2;%p1%s^G, -+ + modify MKlib_gen.sh to avoid passing "#" tokens through the C -+ preprocessor. This works around Mac OS X's preprocessor, which -+ insists on adding a blank on each side of the token (report/analysis -+ by Kevin Murphy ). -+ -+20030215 -+ + add configure check for wchar_t and wint_t types, rather than rely -+ on preprocessor definitions. Also work around for gcc fixinclude -+ bug which creates a shadow copy of curses.h if it sees these symbols -+ apparently typedef'd. -+ + if database is disabled, do not generate run_tic.sh -+ + minor fixes for memory-leak checking when termcap is read. -+ -+20030208 -+ + add checking in tic for incomplete line-drawing character mapping. -+ + update configure script to reflect fix for AC_PROG_GCC_TRADITIONAL, -+ which is broken in autoconf 2.5x for Mac OS X 10.2.3 (report by -+ Gerben Wierda ). -+ + make return value from _nc_printf_string() consistent. Before, -+ depending on whether --enable-safe-sprintf was used, it might not be -+ cached for reallocating. -+ -+20030201 -+ + minor fixes for memory-leak checking in lib_tparm.c, hardscroll.c -+ + correct a potentially-uninitialized value if _read_termtype() does -+ not read as much data as expected (report by Wolfgang Rohdewald -+ ). -+ + correct several places where the aclocal.m4 macros relied on cache -+ variable names which were incompatible (as usual) between autoconf -+ 2.13 and 2.5x, causing the test for broken-linker to give incorrect -+ results (reports by Gerben Wierda and Thomas Esser -+ ). -+ + do not try to open gpm mouse driver if standard output is not a tty; -+ the gpm library does not make this check (from bug report for dialog -+ by David Oliveira ). -+ -+20030125 -+ + modified emx.src to correspond more closely to terminfo.src, added -+ emx-base to the latter -TD -+ + add configure option for FreeBSD sysmouse, --with-sysmouse, and -+ implement support for that in lib_mouse.c, lib_getch.c -+ -+20030118 -+ + revert 20030105 change to can_clear_with(), does not work for the -+ case where the update is made on cells which are blanks with -+ attributes, e.g., reverse. -+ + improve ifdef's to guard against redefinition of wchar_t and wint_t -+ in curses.h (report by Urs Jansen). -+ -+20030111 -+ + improve mvcur() by checking if it is safe to move when video -+ attributes are set (msgr), and if not, reset/restore attributes -+ within that function rather than doing it separately in the GoTo() -+ function in tty_update.c (suggested by Philippe Blain). -+ + add a message in run_tic.in to explain more clearly what does not -+ work when attempting to create a symbolic link for /usr/lib/terminfo -+ on OS/2 and other platforms with no symbolic links (report by John -+ Polterak). -+ + change several sed scripts to avoid using "\+" since it is not a BRE -+ (basic regular expression). One instance caused terminfo.5 to be -+ misformatted on FreeBSD (from a FreeBSD bug report by Kazuo Horikawa -+ ). -+ + correct misspelled 'wint_t' in curs_get_wch.3x (Michael Elkins). -+ -+20030105 -+ + improve description of terminfo operators, especially static/dynamic -+ variables (comments by Mark I Manning IV ). -+ + demonstrate use of FIELDTYPE by modifying test/ncurses 'r' test to -+ use the predefined TYPE_ALPHA field-type, and by defining a -+ specialized type for the middle initial/name. -+ + fix MKterminfo.sh, another workaround for POSIXLY_CORRECT misfeature -+ of sed 4.0 -+ > Philippe Blain: -+ + optimize can_clear_with() a little by testing first if the parameter -+ is indeed a "blank". -+ + simplify ClrBottom() a little by allowing it to use clr_eos to clear -+ sections as small as one line. -+ + improve ClrToEOL() by checking if clr_eos is available before trying -+ to use it. -+ + use tputs() rather than putp() in a few cases in tty_update.c since -+ the corresponding delays are proportional to the number of lines -+ affected: repeat_char, clr_eos, change_scroll_region. -+ -+20021231 -+ + rewrite of lib_acs.c conflicts with copying of SCREEN acs_map to/from -+ global acs_map[] array; removed the lines that did the copying. -+ -+20021228 -+ + change some overlooked tputs() calls in scrolling code to use putp() -+ (report by Philippe Blain). -+ + modify lib_getch.c to avoid recursion via wgetnstr() when the input -+ is not a tty and consequently mode-changes do not work (report by -+ ). -+ + rewrote lib_acs.c to allow PutAttrChar() to decide how to render -+ alternate-characters, i.e., to work with Linux console and UTF-8 -+ locale. -+ + correct line/column reference in adjust_window(), needed to make -+ special windows such as curscr track properly when resizing (report -+ by Lucas Gonze ). -+ > Philippe Blain: -+ + correct the value used for blank in ClrBottom() (broken in 20000708). -+ + correct an off-by-one in GoTo() parameter in _nc_scrolln(). -+ -+20021221 -+ + change several tputs() calls in scrolling code to use putp(), to -+ enable padding which may be needed for some terminals (patch by -+ by Philippe Blain). -+ + use '%' as sed substitute delimiter in run_tic script to avoid -+ problems with pathname delimiters such as ':' and '@' (report by John -+ Polterak). -+ + implement a workaround so that line-drawing works with screen's -+ crippled UTF-8 support (tested with 3.9.13). This only works with -+ the wide-character support (--enable-widec); the normal library will -+ simply suppress line-drawing when running in a UTF-8 locale in screen. -+ -+20021214 -+ + allow BUILD_CC and related configure script variables to be -+ overridden from the environment. -+ + make build-tools variables in ncurses/Makefile.in consistent with -+ the configure script variables (report by Maciej W Rozycki). -+ + modify ncurses/modules to allow -+ configure --disable-leaks --disable-ext-funcs -+ to build (report by Gary Samuelson). -+ + fix a few places in configure.in which lacked quotes (report by -+ Gary Samuelson ). -+ + correct handling of multibyte characters in waddch_literal() which -+ force wrapping because they are started too late on the line (report -+ by Sam Varshavchik). -+ + small fix for CF_GNAT_VERSION to ignore the help-message which -+ gnatmake adds to its version-message. -+ > Maciej W Rozycki : -+ + use AC_CHECK_TOOL to get proper values for AR and LD for cross -+ compiling. -+ + use $cross_compiling variable in configure script rather than -+ comparing $host_alias and $target alias, since "host" is -+ traditionally misused in autoconf to refer to the target platform. -+ + change configure --help message to use "build" rather than "host" -+ when referring to the --with-build-XXX options. -+ -+20021206 -+ + modify CF_GNAT_VERSION to print gnatmake's version, and to allow for -+ possible gnat versions such as 3.2 (report by Chris Lingard -+ ). -+ + modify #define's for CKILL and other default control characters in -+ tset to use the system's default values if they are defined. -+ + correct interchanged defaults for kill and interrupt characters -+ in tset, which caused it to report unnecessarily (Debian #171583). -+ + repair check for missing C++ compiler, which is broken in autoconf -+ 2.5x by hardcoding it to g++ (report by Martin Mokrejs). -+ + update config.guess, config.sub (2002-11-30) -+ + modify configure script to skip --with-shared, etc., when the -+ --with-libtool option is given, since they would be ignored anyway. -+ + fix to allow "configure --with-libtool --with-termlib" to build. -+ + modify configure script to show version number of libtool, to help -+ with bug reports. libtool still gets confused if the installed -+ ncurses libraries are old, since it ignores the -L options at some -+ point (tested with libtool 1.3.3 and 1.4.3). -+ + reorder configure script's updating of $CPPFLAGS and $CFLAGS to -+ prevent -I options in the user's environment from introducing -+ conflicts with the build -I options (may be related to reports by -+ Patrick Ash and George Goffe). -+ + rename test/define_key.c to test/demo_defkey.c, test/keyok.c to -+ test/demo_keyok.c to allow building these with libtool. -+ -+20021123 -+ + add example program test/define_key.c for define_key(). -+ + add example program test/keyok.c for keyok(). -+ + add example program test/ins_wide.c for wins_wch() and wins_wstr(). -+ + modify wins_wch() and wins_wstr() to interpret tabs by using the -+ winsch() internal function. -+ + modify setcchar() to allow for wchar_t input strings that have -+ more than one spacing character. -+ -+20021116 -+ + fix a boundary check in lib_insch.c (patch by Philippe Blain). -+ + change type for *printw functions from NCURSES_CONST to const -+ (prompted by comment by Pedro Palhoto Matos , -+ but really from a note on X/Open's website stating that either is -+ acceptable, and the latter will be used in a future revision). -+ + add xterm-1002, xterm-1003 terminfo entries to demonstrate changes in -+ lib_mouse.c (20021026) -TD -+ + add screen-bce, screen-s entries from screen 3.9.13 (report by -+ Adam Lazur ) -TD -+ + add mterm terminfo entries -TD -+ -+20021109 -+ + split-out useful fragments in terminfo for vt100 and vt220 numeric -+ keypad, i.e., vt100+keypad, vt100+pfkeys, vt100+fnkeys and -+ vt220+keypad. The last as embedded in various entries had ka3 and -+ kb2 interchanged (report/discussion with Leonard den Ottolander -+ ). -+ + add check in tic for keypads consistent with vt100 layout. -+ + improve checks in tic for color capabilities -+ -+20021102 -+ + check for missing/empty/illegal terminfo name in _nc_read_entry() -+ (report by Martin Mokrejs, where $TERM was set to an empty string). -+ + rewrote lib_insch.c, combining it with lib_insstr.c so both handle -+ tab and other control characters consistently (report by Philippe -+ Blain). -+ + remove an #undef for KEY_EVENT from curses.tail used in the -+ experimental NCURSES_WGETCH_EVENTS feature. The #undef confuses -+ dpkg's build script (Debian #165897). -+ + fix MKlib_gen.sh, working around the ironically named POSIXLY_CORRECT -+ feature of GNU sed 4.0 (reported by Ervin Nemeth ). -+ -+20021026 -+ + implement logic in lib_mouse.c to handle position reports which are -+ generated when XFree86 xterm is initialized with private modes 1002 -+ or 1003. These are returned to the application as the -+ REPORT_MOUSE_POSITION mask, which was not implemented. Tested both -+ with ncurses 'a' menu (prompted by discussion with Larry Riedel -+ ). -+ + modify lib_mouse.c to look for "XM" terminfo string, which allows -+ one to override the escape sequence used to enable/disable mouse -+ mode. In particular this works for XFree86 xterm private modes -+ 1002 and 1003. If "XM" is missing (note that this is an extended -+ name), lib_mouse uses the conventional private mode 1000. -+ + correct NOT_LOCAL() macro in lib_mvcur.c to refer to screen_columns -+ where it used screen_lines (report by Philippe Blain). -+ + correct makefile rules for the case when both --with-libtool and -+ --with-gpm are given (report by Mr E_T ). -+ + add note to terminfo manpage regarding the differences between -+ setaf/setab and setf/setb capabilities (report by Pavel Roskin). -+ -+20021019 -+ + remove redundant initialization of TABSIZE in newterm(), since it is -+ already done in setupterm() (report by Philippe Blain). -+ + add test/inserts.c, to test winnstr() and winsch(). -+ + replace 'sort' in dist.mk with script that sets locale to POSIX. -+ + update URLs in announce.html.in (patch by Frederic L W Meunier). -+ + remove glibc add-on files, which are no longer needed (report by -+ Frederic L W Meunier). -+ - 20021012 5.3 release for upload to ftp.gnu.org - + modify ifdef's in etip.h.in to allow the etip.h header to compile - with gcc 3.2 (patch by Dimitar Zhekov ). -diff -urNd -urNd ncurses-5.3/README ncurses-5.3.20030906.orig/README ---- ncurses-5.3/README Sat Aug 12 18:31:21 2000 -+++ ncurses-5.3.20030906.orig/README Tue May 13 20:08:22 2003 -@@ -1,4 +1,4 @@ ---- $Id: README,v 1.20 2000/08/12 23:31:21 tom Exp $ -+-- $Id: README,v 1.21 2003/02/08 19:36:39 tom Exp $ - ------------------------------------------------------------------------------- - README file for the ncurses package - -@@ -43,6 +43,14 @@ - libform.so (shared) - libform_g.a (debug enabled) - -+If you configure using the --enable-widec option, a "w" is appended to the -+library names (e.g., libncursesw.a), and the resulting libraries support -+wide-characters, e.g., via a UTF-8 locale. The corresponding header files -+are compatible with the non-wide-character configuration; wide-character -+features are provided by ifdef's in the header files. The wide-character -+library interfaces are not binary-compatible with the non-wide-character -+version. -+ - The ncurses libraries implement the curses API. The panel, menu and forms - libraries implement clones of the SVr4 panel, menu and forms APIs. The source - code for these lives in the `ncurses', `panel', `menu', and `form' directories -diff -urNd -urNd ncurses-5.3/aclocal.m4 ncurses-5.3.20030906.orig/aclocal.m4 ---- ncurses-5.3/aclocal.m4 Sat Sep 21 18:59:01 2002 -+++ ncurses-5.3.20030906.orig/aclocal.m4 Fri Sep 12 16:42:59 2003 -@@ -1,5 +1,5 @@ - dnl*************************************************************************** --dnl Copyright (c) 1998-2000,2001,2002 Free Software Foundation, Inc. * -+dnl Copyright (c) 1998-2002,2003 Free Software Foundation, Inc. * - dnl * - dnl Permission is hereby granted, free of charge, to any person obtaining a * - dnl copy of this software and associated documentation files (the * -@@ -26,22 +26,24 @@ - dnl authorization. * - dnl*************************************************************************** - dnl --dnl Author: Thomas E. Dickey 1996,1997,1998,1999,2000,2001 -+dnl Author: Thomas E. Dickey 1995-2003 - dnl --dnl $Id: aclocal.m4,v 1.285 2002/09/21 23:59:01 tom Exp $ -+dnl $Id: aclocal.m4,v 1.313 2003/09/06 23:46:28 tom Exp $ - dnl Macros used in NCURSES auto-configuration script. - dnl - dnl See http://invisible-island.net/autoconf/ for additional information. - dnl - dnl --------------------------------------------------------------------------- - dnl --------------------------------------------------------------------------- -+dnl CF_ADA_INCLUDE_DIRS version: 4 updated: 2002/12/01 00:12:15 -+dnl ------------------- - dnl Construct the list of include-options for the C programs in the Ada95 - dnl binding. - AC_DEFUN([CF_ADA_INCLUDE_DIRS], - [ --ACPPFLAGS="$ACPPFLAGS -I. -I../../include" -+ACPPFLAGS="-I. -I../../include $ACPPFLAGS" - if test "$srcdir" != "."; then -- ACPPFLAGS="$ACPPFLAGS -I\$(srcdir)/../../include" -+ ACPPFLAGS="-I\$(srcdir)/../../include $ACPPFLAGS" - fi - if test "$GCC" != yes; then - ACPPFLAGS="$ACPPFLAGS -I\$(includedir)" -@@ -57,6 +59,8 @@ - AC_SUBST(ACPPFLAGS) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_ADD_CFLAGS version: 5 updated: 2002/12/01 00:12:15 -+dnl ------------- - dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS - dnl The second parameter if given makes this macro verbose. - AC_DEFUN([CF_ADD_CFLAGS], -@@ -88,11 +92,13 @@ - - if test -n "$cf_new_cppflags" ; then - ifelse($2,,,[CF_VERBOSE(add to \$CPPFLAGS $cf_new_cppflags)]) -- CPPFLAGS="$CPPFLAGS $cf_new_cppflags" -+ CPPFLAGS="$cf_new_cppflags $CPPFLAGS" - fi - - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_ANSI_CC_CHECK version: 9 updated: 2001/12/30 17:53:34 -+dnl ---------------- - dnl This is adapted from the macros 'fp_PROG_CC_STDC' and 'fp_C_PROTOTYPES' - dnl in the sharutils 4.2 distribution. - AC_DEFUN([CF_ANSI_CC_CHECK], -@@ -143,6 +149,8 @@ - fi - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_ANSI_CC_REQD version: 3 updated: 1997/09/06 13:40:44 -+dnl --------------- - dnl For programs that must use an ANSI compiler, obtain compiler options that - dnl will make it recognize prototypes. We'll do preprocessor checks in other - dnl macros, since tools such as unproto can fake prototypes, but only part of -@@ -159,6 +167,8 @@ - fi - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_BOOL_DECL version: 6 updated: 2001/12/02 01:39:28 -+dnl ------------ - dnl Test if 'bool' is a builtin type in the configured C++ compiler. Some - dnl older compilers (e.g., gcc 2.5.8) don't support 'bool' directly; gcc - dnl 2.6.3 does, in anticipation of the ANSI C++ standard. -@@ -185,6 +195,8 @@ - fi - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_BOOL_SIZE version: 10 updated: 2002/02/23 20:38:31 -+dnl ------------ - dnl Test for the size of 'bool' in the configured C++ compiler (e.g., a type). - dnl Don't bother looking for bool.h, since it's been deprecated. - dnl -@@ -251,6 +263,8 @@ - fi - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_CFG_DEFAULTS version: 6 updated: 2003/07/12 15:15:19 -+dnl --------------- - dnl Determine the default configuration into which we'll install ncurses. This - dnl can be overridden by the user's command-line options. There's two items to - dnl look for: -@@ -267,7 +281,7 @@ - if test "x$prefix" = "xNONE" ; then - case "$cf_cv_system_name" in - # non-vendor systems don't have a conflict -- openbsd*|netbsd*|freebsd*|linux*|cygwin*) -+ openbsd*|netbsd*|freebsd*|linux*|cygwin*|k*bsd*-gnu) - prefix=/usr - ;; - *) prefix=$ac_default_prefix -@@ -303,6 +317,8 @@ - fi - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_CGETENT version: 3 updated: 2000/08/12 23:18:52 -+dnl ---------- - dnl Check if the terminal-capability database functions are available. If not, - dnl ncurses has a much-reduced version. - AC_DEFUN([CF_CGETENT],[ -@@ -324,6 +340,8 @@ - test "$cf_cv_cgetent" = yes && AC_DEFINE(HAVE_BSD_CGETENT) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_CHECK_CACHE version: 7 updated: 2001/12/19 00:50:10 -+dnl -------------- - dnl Check if we're accidentally using a cache from a different machine. - dnl Derive the system name, as a check for reusing the autoconf cache. - dnl -@@ -354,6 +372,8 @@ - fi - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_CHECK_ERRNO version: 9 updated: 2001/12/30 18:03:23 -+dnl -------------- - dnl Check for data that is usually declared in or , e.g., - dnl the 'errno' variable. Define a DECL_xxx symbol if we must declare it - dnl ourselves. -@@ -383,6 +403,8 @@ - CF_CHECK_EXTERN_DATA($1,int) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_CHECK_EXTERN_DATA version: 3 updated: 2001/12/30 18:03:23 -+dnl -------------------- - dnl Check for existence of external data in the current set of libraries. If - dnl we can modify it, it's real enough. - dnl $1 = the name to check -@@ -406,6 +428,8 @@ - - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_CPP_PARAM_INIT version: 4 updated: 2001/04/07 22:31:18 -+dnl ----------------- - dnl Check if the C++ compiler accepts duplicate parameter initialization. This - dnl is a late feature for the standard and is not in some recent compilers - dnl (1999/9/11). -@@ -439,6 +463,8 @@ - test "$cf_cv_cpp_param_init" = yes && AC_DEFINE(CPP_HAS_PARAM_INIT) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_CPP_VSCAN_FUNC version: 5 updated: 2001/12/02 01:39:28 -+dnl ----------------- - dnl Check if the g++ compiler supports vscan function (not a standard feature). - AC_DEFUN([CF_CPP_VSCAN_FUNC], - [ -@@ -515,9 +541,13 @@ - esac - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52 -+dnl ---------- - dnl "dirname" is not portable, so we fake it with a shell script. --AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's:/[[^/]]*$::'`])dnl -+AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_DIRS_TO_MAKE version: 3 updated: 2002/02/23 20:38:31 -+dnl --------------- - AC_DEFUN([CF_DIRS_TO_MAKE], - [ - DIRS_TO_MAKE="lib" -@@ -537,12 +567,16 @@ - AC_SUBST(DIRS_TO_MAKE) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_ERRNO version: 5 updated: 1997/11/30 12:44:39 -+dnl -------- - dnl Check if 'errno' is declared in - AC_DEFUN([CF_ERRNO], - [ - CF_CHECK_ERRNO(errno) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_ETIP_DEFINES version: 3 updated: 2003/03/22 19:13:43 -+dnl --------------- - dnl Test for conflicting definitions of exception in gcc 2.8.0, etc., between - dnl math.h and builtin.h, only for ncurses - AC_DEFUN([CF_ETIP_DEFINES], -@@ -554,7 +588,7 @@ - do - for cf_excp in "" MATH_EXCEPTION - do -- CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu" -+ CXXFLAGS="$cf_save_CXXFLAGS -I${srcdir}/c++ -I${srcdir}/menu -I${srcdir}/include" - test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}" - test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}" - AC_TRY_COMPILE([ -@@ -571,6 +605,8 @@ - CXXFLAGS="$cf_save_CXXFLAGS" - ]) - dnl --------------------------------------------------------------------------- -+dnl CF_FUNC_MEMMOVE version: 5 updated: 2000/08/12 23:18:52 -+dnl --------------- - dnl Check for memmove, or a bcopy that can handle overlapping copy. If neither - dnl is found, add our own version of memmove to the list of objects. - AC_DEFUN([CF_FUNC_MEMMOVE], -@@ -600,6 +636,8 @@ - fi - ])])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_FUNC_POLL version: 2 updated: 2000/02/06 01:38:04 -+dnl ------------ - dnl See if the poll function really works. Some platforms have poll(), but - dnl it does not work for terminals or files. - AC_DEFUN([CF_FUNC_POLL],[ -@@ -627,6 +665,8 @@ - test "$cf_cv_working_poll" = "yes" && AC_DEFINE(HAVE_WORKING_POLL) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_FUNC_TERMIOS version: 2 updated: 2000/07/22 23:37:24 -+dnl --------------- - dnl Some old/broken variations define tcgetattr() only as a macro in - dnl termio(s).h - AC_DEFUN([CF_FUNC_TERMIOS],[ -@@ -654,6 +694,8 @@ - test "$cf_cv_have_tcgetattr" = yes && AC_DEFINE(HAVE_TCGETATTR) - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_FUNC_VSSCANF version: 3 updated: 2001/12/19 00:50:10 -+dnl --------------- - dnl Check for vsscanf() function, which is in c9x but generally not in earlier - dnl versions of C. It is in the GNU C library, and can often be simulated by - dnl other functions. -@@ -697,6 +739,8 @@ - - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_GCC_ATTRIBUTES version: 9 updated: 2002/12/21 19:25:52 -+dnl ----------------- - dnl Test for availability of useful gcc __attribute__ directives to quiet - dnl compiler warnings. Though useful, not all are supported -- and contrary - dnl to documentation, unrecognized directives cause older compilers to barf. -@@ -761,8 +805,6 @@ - if AC_TRY_EVAL(ac_compile); then - test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute) - cat conftest.h >>confdefs.h --# else --# sed -e 's/__attr.*/\/*nothing*\//' conftest.h >>confdefs.h - fi - done - else -@@ -772,17 +814,35 @@ - fi - ])dnl - dnl --------------------------------------------------------------------------- -+dnl CF_GCC_VERSION version: 3 updated: 2003/09/06 19:16:57 -+dnl -------------- -+dnl Find version of gcc -+AC_DEFUN([CF_GCC_VERSION],[ -+AC_REQUIRE([AC_PROG_CC]) -+GCC_VERSION=none -+if test "$GCC" = yes ; then -+ AC_MSG_CHECKING(version of $CC) -+ GCC_VERSION="`${CC} --version|sed -e '2,$d' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`" -+ test -z "$GCC_VERSION" && GCC_VERSION=unknown -+ AC_MSG_RESULT($GCC_VERSION) -+fi -+])dnl -+dnl --------------------------------------------------------------------------- -+dnl CF_GCC_WARNINGS version: 15 updated: 2003/07/05 18:42:30 -+dnl --------------- - dnl Check if the compiler supports useful warning options. There's a few that - dnl we don't use, simply because they're too noisy: - dnl - dnl -Wconversion (useful in older versions of gcc, but not in gcc 2.7.x) - dnl -Wredundant-decls (system headers make this too noisy) - dnl -Wtraditional (combines too many unrelated messages, only a few useful) --dnl -Wwrite-strings