From a0bb9c404174926bf131a5989a0524a6eecd09eb Mon Sep 17 00:00:00 2001 From: "Thomas E. Dickey" Date: Sun, 6 Oct 2013 00:21:13 +0000 Subject: [PATCH] ncurses 5.9 - patch 20131005 + minor fixes for ncurses-example package and makefile. + add scripts for test-builds of cross-compiler packages for ncurses6 to MinGW. --- MANIFEST | 14 +++ Makefile.in | 4 +- NEWS | 7 +- dist.mk | 4 +- include/Caps.keys | 4 +- ncurses/Makefile.in | 4 +- ncurses/tinfo/getenv_num.c | 4 +- package/debian-mingw/changelog | 5 ++ package/debian-mingw/compat | 1 + package/debian-mingw/control | 16 ++++ package/debian-mingw/copyright | 112 +++++++++++++++++++++++ package/debian-mingw/rules | 130 +++++++++++++++++++++++++++ package/debian-mingw/source/format | 1 + package/debian-mingw/watch | 4 + package/debian-mingw64/changelog | 5 ++ package/debian-mingw64/compat | 1 + package/debian-mingw64/control | 16 ++++ package/debian-mingw64/copyright | 112 +++++++++++++++++++++++ package/debian-mingw64/rules | 130 +++++++++++++++++++++++++++ package/debian-mingw64/source/format | 1 + package/debian-mingw64/watch | 4 + package/debian/changelog | 4 +- package/mingw-ncurses.spec | 2 +- package/ncurses.spec | 2 +- test/Makefile.in | 4 +- test/README | 4 +- test/package/ncurses-examples.spec | 4 +- 27 files changed, 579 insertions(+), 20 deletions(-) create mode 100644 package/debian-mingw/changelog create mode 100644 package/debian-mingw/compat create mode 100644 package/debian-mingw/control create mode 100644 package/debian-mingw/copyright create mode 100644 package/debian-mingw/rules create mode 100644 package/debian-mingw/source/format create mode 100644 package/debian-mingw/watch create mode 100644 package/debian-mingw64/changelog create mode 100644 package/debian-mingw64/compat create mode 100644 package/debian-mingw64/control create mode 100644 package/debian-mingw64/copyright create mode 100644 package/debian-mingw64/rules create mode 100644 package/debian-mingw64/source/format create mode 100644 package/debian-mingw64/watch diff --git a/MANIFEST b/MANIFEST index 7495a414..5488d673 100644 --- a/MANIFEST +++ b/MANIFEST @@ -974,6 +974,20 @@ ./ncurses/win32con/gettimeofday.c ./ncurses/win32con/wcwidth.c ./ncurses/win32con/win_driver.c +./package/debian-mingw/changelog +./package/debian-mingw/compat +./package/debian-mingw/control +./package/debian-mingw/copyright +./package/debian-mingw/rules +./package/debian-mingw/source/format +./package/debian-mingw/watch +./package/debian-mingw64/changelog +./package/debian-mingw64/compat +./package/debian-mingw64/control +./package/debian-mingw64/copyright +./package/debian-mingw64/rules +./package/debian-mingw64/source/format +./package/debian-mingw64/watch ./package/debian/changelog ./package/debian/compat ./package/debian/control diff --git a/Makefile.in b/Makefile.in index a68a946e..6c5b6f96 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.36 2013/08/03 22:58:52 tom Exp $ +# $Id: Makefile.in,v 1.37 2013/08/03 22:58:52 tom Exp $ ############################################################################## -# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # +# Copyright (c) 1998-2012,2013 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"), # diff --git a/NEWS b/NEWS index e114d40c..6990bdb6 100644 --- a/NEWS +++ b/NEWS @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: NEWS,v 1.2109 2013/09/28 22:55:29 tom Exp $ +-- $Id: NEWS,v 1.2112 2013/10/05 23:46:51 tom Exp $ ------------------------------------------------------------------------------- This is a log of changes that ncurses has gone through since Zeyd started @@ -45,6 +45,11 @@ 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. +20131005 + + minor fixes for ncurses-example package and makefile. + + add scripts for test-builds of cross-compiler packages for ncurses6 + to MinGW. + 20130928 + some build-fixes for ncurses-examples with NetBSD-6.0 curses, though it lacks some common functions such as use_env() which is not yet diff --git a/dist.mk b/dist.mk index 2cd3e99c..85f249c2 100644 --- a/dist.mk +++ b/dist.mk @@ -25,7 +25,7 @@ # use or other dealings in this Software without prior written # # authorization. # ############################################################################## -# $Id: dist.mk,v 1.946 2013/09/28 17:24:42 tom Exp $ +# $Id: dist.mk,v 1.947 2013/10/05 14:36:58 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 = 20130928 +NCURSES_PATCH = 20131005 # We don't append the patch to the version, since this only applies to releases VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR) diff --git a/include/Caps.keys b/include/Caps.keys index f3a730ce..99c65b78 100644 --- a/include/Caps.keys +++ b/include/Caps.keys @@ -1,5 +1,5 @@ ############################################################################## -# Copyright (c) 2001-2010,2011 Free Software Foundation, Inc. # +# Copyright (c) 2001-2011,2013 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"), # @@ -29,7 +29,7 @@ # Author: Thomas Dickey # and: Ilya Zakharevich # -# $Id: Caps.keys,v 1.6 2013/07/20 17:59:24 tom Exp $ +# $Id: Caps.keys,v 1.7 2013/07/20 17:59:24 tom Exp $ # # This is an adaptation of ncurses' termcap/terminfo capability table, which # is illustrates an experimental extension to describe alt-, shift- and diff --git a/ncurses/Makefile.in b/ncurses/Makefile.in index f4965c08..f08bafb2 100644 --- a/ncurses/Makefile.in +++ b/ncurses/Makefile.in @@ -1,6 +1,6 @@ -# $Id: Makefile.in,v 1.138 2013/08/04 20:20:45 tom Exp $ +# $Id: Makefile.in,v 1.139 2013/08/04 20:20:45 tom Exp $ ############################################################################## -# Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. # +# Copyright (c) 1998-2012,2013 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"), # diff --git a/ncurses/tinfo/getenv_num.c b/ncurses/tinfo/getenv_num.c index 80a349a1..d5e35cb4 100644 --- a/ncurses/tinfo/getenv_num.c +++ b/ncurses/tinfo/getenv_num.c @@ -1,5 +1,5 @@ /**************************************************************************** - * Copyright (c) 1998-2000,2012 Free Software Foundation, Inc. * + * Copyright (c) 1998-2012,2013 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 * @@ -36,7 +36,7 @@ #include -MODULE_ID("$Id: getenv_num.c,v 1.5 2013/09/28 20:25:08 tom Exp $") +MODULE_ID("$Id: getenv_num.c,v 1.6 2013/09/28 20:25:08 tom Exp $") NCURSES_EXPORT(int) _nc_getenv_num(const char *name) diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog new file mode 100644 index 00000000..2bfd3915 --- /dev/null +++ b/package/debian-mingw/changelog @@ -0,0 +1,5 @@ +ncurses6 (5.9-20131005) unstable; urgency=low + + * initial release + + -- Thomas E. Dickey Sat, 05 Oct 2013 13:35:29 -0400 diff --git a/package/debian-mingw/compat b/package/debian-mingw/compat new file mode 100644 index 00000000..7ed6ff82 --- /dev/null +++ b/package/debian-mingw/compat @@ -0,0 +1 @@ +5 diff --git a/package/debian-mingw/control b/package/debian-mingw/control new file mode 100644 index 00000000..b32a33eb --- /dev/null +++ b/package/debian-mingw/control @@ -0,0 +1,16 @@ +Source: ncurses6 +Section: libdevel +Priority: optional +Maintainer: Thomas E. Dickey +Homepage: http://invisible-island.net/ncurses/ +Build-Depends: debhelper (>= 7) +Standards-Version: 3.8.2 + +Package: mingw32-ncurses6 +Architecture: any +Depends: ${misc:Depends} +Description: shared libraries for terminal handling + The ncurses library routines are a terminal-independent method of + updating character screens with reasonable optimization. + . + This package is used for testing ABI 6 with the MinGW 32-bit port. diff --git a/package/debian-mingw/copyright b/package/debian-mingw/copyright new file mode 100644 index 00000000..ac6d8a73 --- /dev/null +++ b/package/debian-mingw/copyright @@ -0,0 +1,112 @@ +This package is used for testing builds of ncurses. + +Copyright (c) 1998-2012 Free Software Foundation, Inc. +Copyright © 2001 by Pradeep Padala + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, distribute with modifications, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization. + + +Copyright (C) 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the X Consor- +tium. + + +Copyright (c) 1980, 1991, 1992, 1993 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + +Copyright 1996-2007 by Thomas E. Dickey + + All Rights Reserved + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization. + +-- vile: txtmode file-encoding=utf-8 diff --git a/package/debian-mingw/rules b/package/debian-mingw/rules new file mode 100644 index 00000000..0c6362ad --- /dev/null +++ b/package/debian-mingw/rules @@ -0,0 +1,130 @@ +#!/usr/bin/make -f +# Made with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Cristoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +BUILD_CC = gcc + +CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion +CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic + +TARGET = i686-w64-mingw32 +MINGW_TOP = /usr/$(TARGET) +MINGW_TMP = $(CURDIR)/debian/mingw32-ncurses6 + +CFLAGS = $(CC_NORMAL) + +CONFIG_OPTIONS = \ + --disable-echo \ + --disable-db-install \ + --disable-getcap \ + --disable-hard-tabs \ + --disable-leaks \ + --disable-macros \ + --disable-overwrite \ + --disable-termcap \ + --enable-const \ + --enable-ext-colors \ + --enable-ext-mouse \ + --enable-interop \ + --enable-sp-funcs \ + --enable-term-driver \ + --enable-warnings \ + --enable-widec \ + --verbose \ + --with-cxx-shared \ + --with-develop \ + --with-fallbacks=unknown,rxvt \ + --with-shared \ + --with-tparm-arg=intptr_t \ + --with-trace \ + --with-xterm-kbs=DEL \ + --without-ada \ + --without-debug \ + --without-manpages \ + --without-progs \ + --without-tests + +export CFLAGS BUILD_CC + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + + CC=$(TARGET)-gcc \ + CFLAGS="$(CFLAGS)" \ + ./configure \ + --host=$(TARGET) \ + --target=$(TARGET) \ + --prefix=$(MINGW_TOP) \ + --with-build-cc=$(BUILD_CC) \ + $(CONFIG_OPTIONS) + + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + + [ ! -f makefile ] || $(MAKE) distclean + + rm -f configure-stamp build-stamp install-stamp + + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install.libs DESTDIR=$(MINGW_TMP) + + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install +# No binary-indep target. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs NEWS + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install install-stamp diff --git a/package/debian-mingw/source/format b/package/debian-mingw/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/package/debian-mingw/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/package/debian-mingw/watch b/package/debian-mingw/watch new file mode 100644 index 00000000..945a9962 --- /dev/null +++ b/package/debian-mingw/watch @@ -0,0 +1,4 @@ +version=3 + +opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \ + debian uupdate diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog new file mode 100644 index 00000000..2bfd3915 --- /dev/null +++ b/package/debian-mingw64/changelog @@ -0,0 +1,5 @@ +ncurses6 (5.9-20131005) unstable; urgency=low + + * initial release + + -- Thomas E. Dickey Sat, 05 Oct 2013 13:35:29 -0400 diff --git a/package/debian-mingw64/compat b/package/debian-mingw64/compat new file mode 100644 index 00000000..7ed6ff82 --- /dev/null +++ b/package/debian-mingw64/compat @@ -0,0 +1 @@ +5 diff --git a/package/debian-mingw64/control b/package/debian-mingw64/control new file mode 100644 index 00000000..a17ed1fc --- /dev/null +++ b/package/debian-mingw64/control @@ -0,0 +1,16 @@ +Source: ncurses6 +Section: libdevel +Priority: optional +Maintainer: Thomas E. Dickey +Homepage: http://invisible-island.net/ncurses/ +Build-Depends: debhelper (>= 7) +Standards-Version: 3.8.2 + +Package: mingw64-ncurses6 +Architecture: any +Depends: ${misc:Depends} +Description: shared libraries for terminal handling + The ncurses library routines are a terminal-independent method of + updating character screens with reasonable optimization. + . + This package is used for testing ABI 6 with the MinGW 64-bit port. diff --git a/package/debian-mingw64/copyright b/package/debian-mingw64/copyright new file mode 100644 index 00000000..ac6d8a73 --- /dev/null +++ b/package/debian-mingw64/copyright @@ -0,0 +1,112 @@ +This package is used for testing builds of ncurses. + +Copyright (c) 1998-2012 Free Software Foundation, Inc. +Copyright © 2001 by Pradeep Padala + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, distribute with modifications, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, +DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR +OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR +THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization. + + +Copyright (C) 1994 X Consortium + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to +deal in the Software without restriction, including without limitation the +rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +sell copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name of the X Consortium shall not +be used in advertising or otherwise to promote the sale, use or other deal- +ings in this Software without prior written authorization from the X Consor- +tium. + + +Copyright (c) 1980, 1991, 1992, 1993 + The Regents of the University of California. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions +are met: +1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. +3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +SUCH DAMAGE. + + +Copyright 1996-2007 by Thomas E. Dickey + + All Rights Reserved + +Permission is hereby granted, free of charge, to any person obtaining a +copy of this software and associated documentation files (the +"Software"), to deal in the Software without restriction, including +without limitation the rights to use, copy, modify, merge, publish, +distribute, sublicense, and/or sell copies of the Software, and to +permit persons to whom the Software is furnished to do so, subject to +the following conditions: + +The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. +IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY +CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, +TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE +SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + +Except as contained in this notice, the name(s) of the above copyright +holders shall not be used in advertising or otherwise to promote the +sale, use or other dealings in this Software without prior written +authorization. + +-- vile: txtmode file-encoding=utf-8 diff --git a/package/debian-mingw64/rules b/package/debian-mingw64/rules new file mode 100644 index 00000000..e292147f --- /dev/null +++ b/package/debian-mingw64/rules @@ -0,0 +1,130 @@ +#!/usr/bin/make -f +# Made with the aid of dh_make, by Craig Small +# Sample debian/rules that uses debhelper. GNU copyright 1997 by Joey Hess. +# Some lines taken from debmake, by Cristoph Lameter. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +BUILD_CC = gcc + +CC_NORMAL = -Wall -Wstrict-prototypes -Wmissing-prototypes -Wshadow -Wconversion +CC_STRICT = $(CC_NORMAL) -W -Wbad-function-cast -Wcast-align -Wcast-qual -Wmissing-declarations -Wnested-externs -Wpointer-arith -Wwrite-strings -ansi -pedantic + +TARGET = x86_64-w64-mingw32 +MINGW_TOP = /usr/$(TARGET) +MINGW_TMP = $(CURDIR)/debian/mingw64-ncurses6 + +CFLAGS = $(CC_NORMAL) + +CONFIG_OPTIONS = \ + --disable-echo \ + --disable-db-install \ + --disable-getcap \ + --disable-hard-tabs \ + --disable-leaks \ + --disable-macros \ + --disable-overwrite \ + --disable-termcap \ + --enable-const \ + --enable-ext-colors \ + --enable-ext-mouse \ + --enable-interop \ + --enable-sp-funcs \ + --enable-term-driver \ + --enable-warnings \ + --enable-widec \ + --verbose \ + --with-cxx-shared \ + --with-develop \ + --with-fallbacks=unknown,rxvt \ + --with-shared \ + --with-tparm-arg=intptr_t \ + --with-trace \ + --with-xterm-kbs=DEL \ + --without-ada \ + --without-debug \ + --without-manpages \ + --without-progs \ + --without-tests + +export CFLAGS BUILD_CC + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: + dh_testdir + + CC=$(TARGET)-gcc \ + CFLAGS="$(CFLAGS)" \ + ./configure \ + --host=$(TARGET) \ + --target=$(TARGET) \ + --prefix=$(MINGW_TOP) \ + --with-build-cc=$(BUILD_CC) \ + $(CONFIG_OPTIONS) + + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + + $(MAKE) + + touch build-stamp + +clean: + dh_testdir + dh_testroot + + [ ! -f makefile ] || $(MAKE) distclean + + rm -f configure-stamp build-stamp install-stamp + + dh_clean + +install: install-stamp +install-stamp: build-stamp + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) install.libs DESTDIR=$(MINGW_TMP) + + touch install-stamp + +# Build architecture-independent files here. +binary-indep: build install +# No binary-indep target. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs NEWS + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install install-stamp diff --git a/package/debian-mingw64/source/format b/package/debian-mingw64/source/format new file mode 100644 index 00000000..163aaf8d --- /dev/null +++ b/package/debian-mingw64/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/package/debian-mingw64/watch b/package/debian-mingw64/watch new file mode 100644 index 00000000..945a9962 --- /dev/null +++ b/package/debian-mingw64/watch @@ -0,0 +1,4 @@ +version=3 + +opts=passive ftp://invisible-island.net/ncurses/current/ncurses\.tar.gz \ + debian uupdate diff --git a/package/debian/changelog b/package/debian/changelog index 558ebdda..a50f0b1f 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -1,8 +1,8 @@ -ncurses6 (5.9-20130928) unstable; urgency=low +ncurses6 (5.9-20131005) unstable; urgency=low * latest weekly patch - -- Thomas E. Dickey Sat, 28 Sep 2013 13:24:42 -0400 + -- Thomas E. Dickey Sat, 05 Oct 2013 10:36:58 -0400 ncurses6 (5.9-20120608) unstable; urgency=low diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec index 06ec8400..915c2ada 100644 --- a/package/mingw-ncurses.spec +++ b/package/mingw-ncurses.spec @@ -3,7 +3,7 @@ Summary: shared libraries for terminal handling Name: mingw32-ncurses6 Release: 5.9 -Version: 20130928 +Version: 20131005 License: X11 Group: Development/Libraries Source: ncurses-%{release}-%{version}.tgz diff --git a/package/ncurses.spec b/package/ncurses.spec index 1c8c2c71..dac62bd3 100644 --- a/package/ncurses.spec +++ b/package/ncurses.spec @@ -1,7 +1,7 @@ Summary: shared libraries for terminal handling Name: ncurses6 Release: 5.9 -Version: 20130928 +Version: 20131005 License: X11 Group: Development/Libraries Source: ncurses-%{release}-%{version}.tgz diff --git a/test/Makefile.in b/test/Makefile.in index a8132064..6600cd78 100644 --- a/test/Makefile.in +++ b/test/Makefile.in @@ -1,4 +1,4 @@ -# $Id: Makefile.in,v 1.110 2013/08/04 20:23:20 tom Exp $ +# $Id: Makefile.in,v 1.111 2013/10/05 23:46:10 tom Exp $ ############################################################################## # Copyright (c) 1998-2011,2013 Free Software Foundation, Inc. # # # @@ -47,6 +47,8 @@ MODEL = ../@DFT_OBJ_SUBDIR@ srcdir = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ + bindir = @bindir@ libdir = @libdir@ includedir = @includedir@ diff --git a/test/README b/test/README index 3850adb1..62b6dff3 100644 --- a/test/README +++ b/test/README @@ -1,5 +1,5 @@ ------------------------------------------------------------------------------- --- Copyright (c) 1998-2011,2012 Free Software Foundation, Inc. -- +-- Copyright (c) 1998-2012,2013 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 -- @@ -25,7 +25,7 @@ -- sale, use or other dealings in this Software without prior written -- -- authorization. -- ------------------------------------------------------------------------------- --- $Id: README,v 1.47 2013/01/19 21:30:38 tom Exp $ +-- $Id: README,v 1.48 2013/01/19 21:30:38 tom Exp $ ------------------------------------------------------------------------------- The programs in this directory are designed to test your newest toy :-) diff --git a/test/package/ncurses-examples.spec b/test/package/ncurses-examples.spec index ad79e5a2..8a016780 100644 --- a/test/package/ncurses-examples.spec +++ b/test/package/ncurses-examples.spec @@ -2,7 +2,7 @@ Summary: ncurses-examples - example/test programs from ncurses %define AppProgram ncurses-examples %define AppVersion MAJOR.MINOR %define AppRelease YYYYMMDD -# $Id: ncurses-examples.spec,v 1.2 2011/03/25 17:46:44 tom Exp $ +# $Id: ncurses-examples.spec,v 1.3 2013/10/05 23:44:19 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: %{AppRelease} @@ -51,5 +51,5 @@ strip $RPM_BUILD_ROOT%{_bindir}/%{AppProgram}/* %changelog # each patch should add its ChangeLog entries here -* Fri Mar 25 2010 Thomas Dickey +* Thu Mar 25 2010 Thomas Dickey - initial version -- 2.44.0