1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/ncurses/ncurses.patch Mon Sep 17 18:58:20 2012 +0200
1.3 @@ -0,0 +1,144 @@
1.4 +Index: include/curses.h.in
1.5 +--- include/curses.h.in.orig 2012-05-29 10:39:26.000000000 +0200
1.6 ++++ include/curses.h.in 2012-05-29 10:39:27.000000000 +0200
1.7 +@@ -63,7 +63,11 @@
1.8 + * User-definable tweak to disable the include of <stdbool.h>.
1.9 + */
1.10 + #ifndef NCURSES_ENABLE_STDBOOL_H
1.11 +-#define NCURSES_ENABLE_STDBOOL_H @cf_cv_header_stdbool_h@
1.12 ++#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L) && !defined(__osf__)
1.13 ++#define NCURSES_ENABLE_STDBOOL_H 1
1.14 ++#else
1.15 ++#define NCURSES_ENABLE_STDBOOL_H 0
1.16 ++#endif
1.17 + #endif
1.18 +
1.19 + /*
1.20 +Index: ncurses/Makefile.in
1.21 +--- ncurses/Makefile.in.orig 2012-05-29 10:39:27.000000000 +0200
1.22 ++++ ncurses/Makefile.in 2012-05-29 10:40:19.000000000 +0200
1.23 +@@ -176,7 +176,7 @@
1.24 + $(INCDIR)/nc_mingw.h
1.25 +
1.26 + TEST_DEPS = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
1.27 +-TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
1.28 ++TEST_ARGS = @TEST_ARGS@ @LDFLAGS_SHARED@
1.29 + TEST_LDFLAGS = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
1.30 +
1.31 + TEST_PROGS = \
1.32 +@@ -292,7 +292,8 @@
1.33 + @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
1.34 +
1.35 + lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
1.36 +- ../@DFT_OBJ_SUBDIR@/dump_entry$o
1.37 ++ ../@DFT_OBJ_SUBDIR@/dump_entry$o \
1.38 ++ ../@DFT_OBJ_SUBDIR@/comp_parse$o
1.39 + @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
1.40 +
1.41 + link_test$x : ./link_test.c $(TEST_DEPS) \
1.42 +Index: ncurses/tinfo/comp_error.c
1.43 +--- ncurses/tinfo/comp_error.c.orig 2012-05-29 10:39:26.000000000 +0200
1.44 ++++ ncurses/tinfo/comp_error.c 2012-05-29 10:39:27.000000000 +0200
1.45 +@@ -43,7 +43,7 @@
1.46 +
1.47 + MODULE_ID("$Id: comp_error.c,v 1.36 2012/02/22 22:34:31 tom Exp $")
1.48 +
1.49 +-NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
1.50 ++NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = TRUE;
1.51 + NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
1.52 + NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */
1.53 +
1.54 +Index: ncurses/tinfo/comp_parse.c
1.55 +--- ncurses/tinfo/comp_parse.c.orig 2012-05-29 10:39:27.000000000 +0200
1.56 ++++ ncurses/tinfo/comp_parse.c 2012-05-29 10:39:27.000000000 +0200
1.57 +@@ -281,6 +281,7 @@
1.58 +
1.59 + DEBUG(2, ("RESOLUTION BEGINNING"));
1.60 +
1.61 ++#if 0
1.62 + /*
1.63 + * Check for multiple occurrences of the same name.
1.64 + */
1.65 +@@ -308,6 +309,7 @@
1.66 + return (FALSE);
1.67 +
1.68 + DEBUG(2, ("NO MULTIPLE NAME OCCURRENCES"));
1.69 ++#endif
1.70 +
1.71 + /*
1.72 + * First resolution stage: compute link pointers corresponding to names.
1.73 +Index: progs/Makefile.in
1.74 +--- progs/Makefile.in.orig 2012-05-29 10:39:27.000000000 +0200
1.75 ++++ progs/Makefile.in 2012-05-29 10:39:27.000000000 +0200
1.76 +@@ -114,10 +114,10 @@
1.77 +
1.78 + LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
1.79 +
1.80 +-LIBS_TIC = @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
1.81 ++LIBS_TIC = @TINFO_LDFLAGS@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
1.82 + LDFLAGS_TIC = @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
1.83 +
1.84 +-LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
1.85 ++LIBS_TINFO = @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
1.86 + LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
1.87 +
1.88 + LINT = @LINT@
1.89 +@@ -228,6 +228,7 @@
1.90 + DEPS_TIC = \
1.91 + $(MODEL)/tic$o \
1.92 + $(MODEL)/dump_entry$o \
1.93 ++ $(MODEL)/comp_parse$o \
1.94 + $(MODEL)/transform$o
1.95 +
1.96 + tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
1.97 +@@ -253,6 +254,7 @@
1.98 +
1.99 + DEPS_TPUT = \
1.100 + $(MODEL)/tput$o \
1.101 ++ $(MODEL)/lib_tparm$o \
1.102 + $(MODEL)/transform$o
1.103 +
1.104 + tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
1.105 +@@ -260,7 +262,8 @@
1.106 +
1.107 + DEPS_INFOCMP = \
1.108 + $(MODEL)/infocmp$o \
1.109 +- $(MODEL)/dump_entry$o
1.110 ++ $(MODEL)/dump_entry$o \
1.111 ++ $(MODEL)/comp_parse$o
1.112 +
1.113 + infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
1.114 + @ECHO_LD@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
1.115 +Index: test/Makefile.in
1.116 +--- test/Makefile.in.orig 2012-05-29 10:39:26.000000000 +0200
1.117 ++++ test/Makefile.in 2012-05-29 10:39:27.000000000 +0200
1.118 +@@ -102,7 +102,7 @@
1.119 + LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
1.120 + LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
1.121 +
1.122 +-TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
1.123 ++TEST_ARGS = @TEST_ARGS@
1.124 +
1.125 + # use these for linking with all of the libraries
1.126 + LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
1.127 +@@ -117,7 +117,7 @@
1.128 + LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
1.129 +
1.130 + # use these for linking with the tinfo library if we have it, or curses library if not
1.131 +-LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
1.132 ++LIBS_TINFO = @TINFO_LIBS@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
1.133 + LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
1.134 +
1.135 + LINT = @LINT@
1.136 +Index: test/programs
1.137 +--- test/programs.orig 2009-09-12 21:44:01.000000000 +0200
1.138 ++++ test/programs 2012-05-29 10:39:27.000000000 +0200
1.139 +@@ -38,7 +38,7 @@
1.140 + clip_printw $(LDFLAGS_CURSES) $(LOCAL_LIBS) clip_printw
1.141 + color_set $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_set
1.142 + demo_altkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_altkeys
1.143 +-demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey
1.144 ++demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey key_defined
1.145 + demo_forms $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_forms edit_field
1.146 + demo_keyok $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_keyok
1.147 + demo_menus $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_menus
