OpenPKG Specs / annotate

ncurses/ncurses.patch@9fe04d4d4e5a (annotated)

ncurses/ncurses.patch

Mon, 17 Sep 2012 19:10:10 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Mon, 17 Sep 2012 19:10:10 +0200
changeset 689
9fe04d4d4e5a
permissions
-rw-r--r--

Update to new version of vendor software although Oracle fails to deliver.
More specifically, newer db(3) patch revisions exist but Oracle has
removed them from the canonical download server URI for Berkely DB.

michael@682 1 Index: include/curses.h.in
michael@682 2 --- include/curses.h.in.orig 2012-05-29 10:39:26.000000000 +0200
michael@682 3 +++ include/curses.h.in 2012-05-29 10:39:27.000000000 +0200
michael@682 4 @@ -63,7 +63,11 @@
michael@682 5 * User-definable tweak to disable the include of <stdbool.h>.
michael@682 6 */
michael@682 7 #ifndef NCURSES_ENABLE_STDBOOL_H
michael@682 8 -#define NCURSES_ENABLE_STDBOOL_H @cf_cv_header_stdbool_h@
michael@682 9 +#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L) && !defined(__osf__)
michael@682 10 +#define NCURSES_ENABLE_STDBOOL_H 1
michael@682 11 +#else
michael@682 12 +#define NCURSES_ENABLE_STDBOOL_H 0
michael@682 13 +#endif
michael@682 14 #endif
michael@682 15
michael@682 16 /*
michael@682 17 Index: ncurses/Makefile.in
michael@682 18 --- ncurses/Makefile.in.orig 2012-05-29 10:39:27.000000000 +0200
michael@682 19 +++ ncurses/Makefile.in 2012-05-29 10:40:19.000000000 +0200
michael@682 20 @@ -176,7 +176,7 @@
michael@682 21 $(INCDIR)/nc_mingw.h
michael@682 22
michael@682 23 TEST_DEPS = ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
michael@682 24 -TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
michael@682 25 +TEST_ARGS = @TEST_ARGS@ @LDFLAGS_SHARED@
michael@682 26 TEST_LDFLAGS = @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
michael@682 27
michael@682 28 TEST_PROGS = \
michael@682 29 @@ -292,7 +292,8 @@
michael@682 30 @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
michael@682 31
michael@682 32 lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
michael@682 33 - ../@DFT_OBJ_SUBDIR@/dump_entry$o
michael@682 34 + ../@DFT_OBJ_SUBDIR@/dump_entry$o \
michael@682 35 + ../@DFT_OBJ_SUBDIR@/comp_parse$o
michael@682 36 @ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
michael@682 37
michael@682 38 link_test$x : ./link_test.c $(TEST_DEPS) \
michael@682 39 Index: ncurses/tinfo/comp_error.c
michael@682 40 --- ncurses/tinfo/comp_error.c.orig 2012-05-29 10:39:26.000000000 +0200
michael@682 41 +++ ncurses/tinfo/comp_error.c 2012-05-29 10:39:27.000000000 +0200
michael@682 42 @@ -43,7 +43,7 @@
michael@682 43
michael@682 44 MODULE_ID("$Id: comp_error.c,v 1.36 2012/02/22 22:34:31 tom Exp $")
michael@682 45
michael@682 46 -NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;
michael@682 47 +NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = TRUE;
michael@682 48 NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */
michael@682 49 NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */
michael@682 50
michael@682 51 Index: ncurses/tinfo/comp_parse.c
michael@682 52 --- ncurses/tinfo/comp_parse.c.orig 2012-05-29 10:39:27.000000000 +0200
michael@682 53 +++ ncurses/tinfo/comp_parse.c 2012-05-29 10:39:27.000000000 +0200
michael@682 54 @@ -281,6 +281,7 @@
michael@682 55
michael@682 56 DEBUG(2, ("RESOLUTION BEGINNING"));
michael@682 57
michael@682 58 +#if 0
michael@682 59 /*
michael@682 60 * Check for multiple occurrences of the same name.
michael@682 61 */
michael@682 62 @@ -308,6 +309,7 @@
michael@682 63 return (FALSE);
michael@682 64
michael@682 65 DEBUG(2, ("NO MULTIPLE NAME OCCURRENCES"));
michael@682 66 +#endif
michael@682 67
michael@682 68 /*
michael@682 69 * First resolution stage: compute link pointers corresponding to names.
michael@682 70 Index: progs/Makefile.in
michael@682 71 --- progs/Makefile.in.orig 2012-05-29 10:39:27.000000000 +0200
michael@682 72 +++ progs/Makefile.in 2012-05-29 10:39:27.000000000 +0200
michael@682 73 @@ -114,10 +114,10 @@
michael@682 74
michael@682 75 LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@)
michael@682 76
michael@682 77 -LIBS_TIC = @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
michael@682 78 +LIBS_TIC = @TINFO_LDFLAGS@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
michael@682 79 LDFLAGS_TIC = @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
michael@682 80
michael@682 81 -LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
michael@682 82 +LIBS_TINFO = @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
michael@682 83 LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
michael@682 84
michael@682 85 LINT = @LINT@
michael@682 86 @@ -228,6 +228,7 @@
michael@682 87 DEPS_TIC = \
michael@682 88 $(MODEL)/tic$o \
michael@682 89 $(MODEL)/dump_entry$o \
michael@682 90 + $(MODEL)/comp_parse$o \
michael@682 91 $(MODEL)/transform$o
michael@682 92
michael@682 93 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
michael@682 94 @@ -253,6 +254,7 @@
michael@682 95
michael@682 96 DEPS_TPUT = \
michael@682 97 $(MODEL)/tput$o \
michael@682 98 + $(MODEL)/lib_tparm$o \
michael@682 99 $(MODEL)/transform$o
michael@682 100
michael@682 101 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
michael@682 102 @@ -260,7 +262,8 @@
michael@682 103
michael@682 104 DEPS_INFOCMP = \
michael@682 105 $(MODEL)/infocmp$o \
michael@682 106 - $(MODEL)/dump_entry$o
michael@682 107 + $(MODEL)/dump_entry$o \
michael@682 108 + $(MODEL)/comp_parse$o
michael@682 109
michael@682 110 infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
michael@682 111 @ECHO_LD@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
michael@682 112 Index: test/Makefile.in
michael@682 113 --- test/Makefile.in.orig 2012-05-29 10:39:26.000000000 +0200
michael@682 114 +++ test/Makefile.in 2012-05-29 10:39:27.000000000 +0200
michael@682 115 @@ -102,7 +102,7 @@
michael@682 116 LDFLAGS_PROFILE = $(LDFLAGS) $(CFLAGS_PROFILE)
michael@682 117 LDFLAGS_SHARED = $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@
michael@682 118
michael@682 119 -TEST_ARGS = @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@
michael@682 120 +TEST_ARGS = @TEST_ARGS@
michael@682 121
michael@682 122 # use these for linking with all of the libraries
michael@682 123 LIBS_DEFAULT = $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)
michael@682 124 @@ -117,7 +117,7 @@
michael@682 125 LDFLAGS_CURSES = $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
michael@682 126
michael@682 127 # use these for linking with the tinfo library if we have it, or curses library if not
michael@682 128 -LIBS_TINFO = @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
michael@682 129 +LIBS_TINFO = @TINFO_LIBS@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
michael@682 130 LDFLAGS_TINFO = @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
michael@682 131
michael@682 132 LINT = @LINT@
michael@682 133 Index: test/programs
michael@682 134 --- test/programs.orig 2009-09-12 21:44:01.000000000 +0200
michael@682 135 +++ test/programs 2012-05-29 10:39:27.000000000 +0200
michael@682 136 @@ -38,7 +38,7 @@
michael@682 137 clip_printw $(LDFLAGS_CURSES) $(LOCAL_LIBS) clip_printw
michael@682 138 color_set $(LDFLAGS_CURSES) $(LOCAL_LIBS) color_set
michael@682 139 demo_altkeys $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_altkeys
michael@682 140 -demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey
michael@682 141 +demo_defkey $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_defkey key_defined
michael@682 142 demo_forms $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_forms edit_field
michael@682 143 demo_keyok $(LDFLAGS_CURSES) $(LOCAL_LIBS) demo_keyok
michael@682 144 demo_menus $(LDFLAGS_DEFAULT) $(LOCAL_LIBS) demo_menus

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial