Permalink
Browse files

Patched ncurses to 5.7-20101113

  • Loading branch information...
1 parent 17c3532 commit bef9bec770f925e7f62c623b711ad75d0a44e267 @mscdex committed Nov 15, 2010
Showing with 1,372 additions and 808 deletions.
  1. +8 −1 deps/ncurses/NEWS
  2. +78 −37 deps/ncurses/aclocal.m4
  3. +120 −87 deps/ncurses/configure
  4. +2 −2 deps/ncurses/dist.mk
  5. +61 −18 deps/ncurses/test/aclocal.m4
  6. +20 −20 deps/ncurses/test/bs.c
  7. +3 −3 deps/ncurses/test/cardfile.c
  8. +10 −8 deps/ncurses/test/clip_printw.c
  9. +817 −404 deps/ncurses/test/configure
  10. +3 −3 deps/ncurses/test/demo_altkeys.c
  11. +2 −2 deps/ncurses/test/demo_defkey.c
  12. +4 −4 deps/ncurses/test/demo_forms.c
  13. +2 −2 deps/ncurses/test/demo_menus.c
  14. +14 −5 deps/ncurses/test/demo_terminfo.c
  15. +2 −1 deps/ncurses/test/ditto.c
  16. +10 −11 deps/ncurses/test/dots.c
  17. +10 −11 deps/ncurses/test/dots_mvcur.c
  18. +15 −14 deps/ncurses/test/echochar.c
  19. +3 −3 deps/ncurses/test/filter.c
  20. +6 −6 deps/ncurses/test/firework.c
  21. +3 −3 deps/ncurses/test/foldkeys.c
  22. +2 −2 deps/ncurses/test/gdc.c
  23. +13 −9 deps/ncurses/test/hanoi.c
  24. +4 −3 deps/ncurses/test/hashtest.c
  25. +5 −5 deps/ncurses/test/inchs.c
  26. +6 −6 deps/ncurses/test/ins_wide.c
  27. +5 −5 deps/ncurses/test/insdelln.c
  28. +11 −11 deps/ncurses/test/knight.c
  29. +2 −2 deps/ncurses/test/linedata.h
  30. +4 −4 deps/ncurses/test/movewindow.c
  31. +24 −20 deps/ncurses/test/ncurses.c
  32. +7 −7 deps/ncurses/test/newdemo.c
  33. +8 −8 deps/ncurses/test/rain.c
  34. +5 −5 deps/ncurses/test/savescreen.c
  35. +4 −4 deps/ncurses/test/tclock.c
  36. +16 −20 deps/ncurses/test/test.priv.h
  37. +6 −6 deps/ncurses/test/test_add_wchstr.c
  38. +6 −6 deps/ncurses/test/test_addwstr.c
  39. +10 −1 deps/ncurses/test/test_arrays.c
  40. +2 −3 deps/ncurses/test/testcurs.c
  41. +16 −13 deps/ncurses/test/view.c
  42. +19 −19 deps/ncurses/test/worm.c
  43. +4 −4 deps/ncurses/test/xmas.c
View
@@ -25,7 +25,7 @@
-- sale, use or other dealings in this Software without prior written --
-- authorization. --
-------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1607 2010/11/06 22:12:59 tom Exp $
+-- $Id: NEWS,v 1.1610 2010/11/13 20:23:02 tom Exp $
-------------------------------------------------------------------------------
This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,13 @@ 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.
+20101113
+ + compiler warning fixes for test programs.
+ + various build-fixes for test-programs with pdcurses.
+ + updated configure checks for X packages in test/configure from xterm
+ #267 changes.
+ + add configure check to gnatmake, to accommodate cygwin.
+
20101106
+ correct list of sub-directories needed in Ada95 tree for building as
a separate package.
View
@@ -28,7 +28,7 @@ dnl***************************************************************************
dnl
dnl Author: Thomas E. Dickey 1995-on
dnl
-dnl $Id: aclocal.m4,v 1.546 2010/10/23 20:14:30 tom Exp $
+dnl $Id: aclocal.m4,v 1.547 2010/11/13 19:17:50 tom Exp $
dnl Macros used in NCURSES auto-configuration script.
dnl
dnl These macros are maintained separately from NCURSES. The copyright on
@@ -1769,6 +1769,34 @@ rm -rf conftest*
AC_SUBST(EXTRA_CFLAGS)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_GNAT_GENERICS version: 1 updated: 2010/11/13 14:15:18
+dnl ----------------
+AC_DEFUN([CF_GNAT_GENERICS],
+[
+AC_MSG_CHECKING(if GNAT supports generics)
+case $cf_gnat_version in #(vi
+3.[[1-9]]*|[[4-9]].*) #(vi
+ cf_gnat_generics=yes
+ ;;
+*)
+ cf_gnat_generics=no
+ ;;
+esac
+AC_MSG_RESULT($cf_gnat_generics)
+
+if test "$cf_gnat_generics" = yes
+then
+ cf_compile_generics=generics
+ cf_generic_objects="\${GENOBJS}"
+else
+ cf_compile_generics=
+ cf_generic_objects=
+fi
+
+AC_SUBST(cf_compile_generics)
+AC_SUBST(cf_generic_objects)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_GNAT_PRAGMA_UNREF version: 1 updated: 2010/06/19 15:22:18
dnl --------------------
dnl Check if the gnat pragma "Unreferenced" works.
@@ -1798,6 +1826,41 @@ fi
AC_SUBST(PRAGMA_UNREF)
])dnl
dnl ---------------------------------------------------------------------------
+dnl CF_GNAT_PROJECTS version: 1 updated: 2010/11/13 14:15:18
+dnl ----------------
+AC_DEFUN([CF_GNAT_PROJECTS],
+[
+AC_MSG_CHECKING(if GNAT supports project files)
+case $cf_gnat_version in #(vi
+3.[[0-9]]*) #(vi
+ cf_gnat_projects=no
+ ;;
+*)
+ case $cf_cv_system_name in #(vi
+ cygwin*) #(vi
+ cf_gnat_projects=no
+ ;;
+ *)
+ cf_gnat_projects=yes
+ ;;
+ esac
+ ;;
+esac
+AC_MSG_RESULT($cf_gnat_projects)
+
+if test "$cf_gnat_projects" = yes
+then
+ USE_OLD_MAKERULES="#"
+ USE_GNAT_PROJECTS=""
+else
+ USE_OLD_MAKERULES=""
+ USE_GNAT_PROJECTS="#"
+fi
+
+AC_SUBST(USE_OLD_MAKERULES)
+AC_SUBST(USE_GNAT_PROJECTS)
+])dnl
+dnl ---------------------------------------------------------------------------
dnl CF_GNAT_TRY_LINK version: 2 updated: 2010/08/14 18:25:37
dnl ----------------
dnl Verify that a test program compiles/links with GNAT.
@@ -1856,51 +1919,29 @@ fi
rm -rf conftest*
])dnl
dnl ---------------------------------------------------------------------------
-dnl CF_GNAT_VERSION version: 15 updated: 2010/10/23 15:52:32
+dnl CF_GNAT_VERSION version: 16 updated: 2010/11/13 14:15:18
dnl ---------------
dnl Verify version of GNAT.
AC_DEFUN([CF_GNAT_VERSION],
[
AC_MSG_CHECKING(for gnat version)
-cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | grep '[[0-9]].[[0-9]][[0-9]]*' |\
- sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
+cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ grep '[[0-9]].[[0-9]][[0-9]]*' |\
+ sed -e '2,$d' -e 's/[[^0-9 \.]]//g' -e 's/^[[ ]]*//' -e 's/ .*//'`
AC_MSG_RESULT($cf_gnat_version)
-case $cf_gnat_version in
- 3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*)
- cf_cv_prog_gnat_correct=yes
- ;;
- *) echo Unsupported GNAT version $cf_gnat_version. Required is 3.11 or better. Disabling Ada95 binding.
- cf_cv_prog_gnat_correct=no
- ;;
-esac
-
-case $cf_gnat_version in
- 3.[[1-9]]*|[[4-9]].*)
- cf_compile_generics=generics
- cf_generic_objects="\${GENOBJS}"
- ;;
- *) cf_compile_generics=
- cf_generic_objects=
- ;;
-esac
-
-case $cf_gnat_version in
- 3.[[0-9]]*)
- USE_OLD_MAKERULES=""
- USE_GNAT_PROJECTS="#"
- ;;
- *)
- USE_OLD_MAKERULES="#"
- USE_GNAT_PROJECTS=""
- ;;
+case $cf_gnat_version in #(vi
+3.1[[1-9]]*|3.[[2-9]]*|[[4-9]].*) #(vi
+ cf_cv_prog_gnat_correct=yes
+ ;;
+*)
+ AC_MSG_WARN(Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding.)
+ cf_cv_prog_gnat_correct=no
+ ;;
esac
-AC_SUBST(cf_compile_generics)
-AC_SUBST(cf_generic_objects)
-
-AC_SUBST(USE_OLD_MAKERULES)
-AC_SUBST(USE_GNAT_PROJECTS)
+CF_GNAT_GENERICS
+CF_GNAT_PROJECTS
])
dnl ---------------------------------------------------------------------------
dnl CF_GNU_SOURCE version: 6 updated: 2005/07/09 13:23:07
Oops, something went wrong.

0 comments on commit bef9bec

Please sign in to comment.