OpenPKG Specs / file revision

ncurses/ncurses.patch@914043724d20

ncurses/ncurses.patch

Sat, 06 Oct 2012 16:24:01 +0200

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 06 Oct 2012 16:24:01 +0200
changeset 727
914043724d20
permissions
-rw-r--r--

Update to new vendor software version and adjust patch code accordingly.
Unfortunately the vendor has apparently failed to properly test this
release which depends on missing object symbols in libsasl2.a(common.o):

undefined reference to `sasl_randcreate'
undefined reference to `sasl_mkchal'
undefined reference to `sasl_utf8verify'
undefined reference to `sasl_rand'
undefined reference to `sasl_churn'
undefined reference to `sasl_encode64'
undefined reference to `sasl_decode64'
undefined reference to `sasl_erasebuffer'
undefined reference to `sasl_randfree'
undefined reference to `sasl_strlower'
undefined reference to `get_fqhostname'

...yet to be patched.

     1 Index: include/curses.h.in

     2 --- include/curses.h.in.orig	2012-05-29 10:39:26.000000000 +0200

     3 +++ include/curses.h.in	2012-05-29 10:39:27.000000000 +0200

     4 @@ -63,7 +63,11 @@

     5   * User-definable tweak to disable the include of <stdbool.h>.

     6   */

     7  #ifndef NCURSES_ENABLE_STDBOOL_H

     8 -#define NCURSES_ENABLE_STDBOOL_H @cf_cv_header_stdbool_h@

     9 +#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L) && !defined(__osf__)

    10 +#define NCURSES_ENABLE_STDBOOL_H 1

    11 +#else

    12 +#define NCURSES_ENABLE_STDBOOL_H 0

    13 +#endif

    14  #endif

    15  

    16  /*

    17 Index: ncurses/Makefile.in

    18 --- ncurses/Makefile.in.orig	2012-05-29 10:39:27.000000000 +0200

    19 +++ ncurses/Makefile.in	2012-05-29 10:40:19.000000000 +0200

    20 @@ -176,7 +176,7 @@

    21  	$(INCDIR)/nc_mingw.h

    22  

    23  TEST_DEPS	= ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@

    24 -TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 

    25 +TEST_ARGS	= @TEST_ARGS@ @LDFLAGS_SHARED@ 

    26  TEST_LDFLAGS	= @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@

    27  

    28  TEST_PROGS = \

    29 @@ -292,7 +292,8 @@

    30  	@ECHO_LD@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)

    31  

    32  lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \

    33 -		../@DFT_OBJ_SUBDIR@/dump_entry$o

    34 +		../@DFT_OBJ_SUBDIR@/dump_entry$o \

    35 +		../@DFT_OBJ_SUBDIR@/comp_parse$o

    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)

    37  

    38  link_test$x : ./link_test.c $(TEST_DEPS) \

    39 Index: ncurses/tinfo/comp_error.c

    40 --- ncurses/tinfo/comp_error.c.orig	2012-05-29 10:39:26.000000000 +0200

    41 +++ ncurses/tinfo/comp_error.c	2012-05-29 10:39:27.000000000 +0200

    42 @@ -43,7 +43,7 @@

    43  

    44  MODULE_ID("$Id: comp_error.c,v 1.36 2012/02/22 22:34:31 tom Exp $")

    45  

    46 -NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = FALSE;

    47 +NCURSES_EXPORT_VAR(bool) _nc_suppress_warnings = TRUE;

    48  NCURSES_EXPORT_VAR(int) _nc_curr_line = 0; /* current line # in input */

    49  NCURSES_EXPORT_VAR(int) _nc_curr_col = 0; /* current column # in input */

    50  

    51 Index: ncurses/tinfo/comp_parse.c

    52 --- ncurses/tinfo/comp_parse.c.orig	2012-05-29 10:39:27.000000000 +0200

    53 +++ ncurses/tinfo/comp_parse.c	2012-05-29 10:39:27.000000000 +0200

    54 @@ -281,6 +281,7 @@

    55  

    56      DEBUG(2, ("RESOLUTION BEGINNING"));

    57  

    58 +#if 0

    59      /*

    60       * Check for multiple occurrences of the same name.

    61       */

    62 @@ -308,6 +309,7 @@

    63  	return (FALSE);

    64  

    65      DEBUG(2, ("NO MULTIPLE NAME OCCURRENCES"));

    66 +#endif

    67  

    68      /*

    69       * First resolution stage: compute link pointers corresponding to names.

    70 Index: progs/Makefile.in

    71 --- progs/Makefile.in.orig	2012-05-29 10:39:27.000000000 +0200

    72 +++ progs/Makefile.in	2012-05-29 10:39:27.000000000 +0200

    73 @@ -114,10 +114,10 @@

    74  

    75  LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)

    76  

    77 -LIBS_TIC	= @TINFO_LDFLAGS@ @LDFLAGS_STATIC@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@

    78 +LIBS_TIC	= @TINFO_LDFLAGS@ @TICS_LIBS@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@

    79  LDFLAGS_TIC	= @TICS_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)

    80  

    81 -LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@

    82 +LIBS_TINFO	= @TINFO_LIBS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@

    83  LDFLAGS_TINFO	= @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)

    84  

    85  LINT		= @LINT@

    86 @@ -228,6 +228,7 @@

    87  DEPS_TIC = \

    88  	$(MODEL)/tic$o \

    89  	$(MODEL)/dump_entry$o \

    90 +	$(MODEL)/comp_parse$o \

    91  	$(MODEL)/transform$o

    92  

    93  tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h

    94 @@ -253,6 +254,7 @@

    95  

    96  DEPS_TPUT = \

    97  	$(MODEL)/tput$o \

    98 +	$(MODEL)/lib_tparm$o \

    99  	$(MODEL)/transform$o

   100  

   101  tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h

   102 @@ -260,7 +262,8 @@

   103  

   104  DEPS_INFOCMP = \

   105  	$(MODEL)/infocmp$o \

   106 -	$(MODEL)/dump_entry$o

   107 +	$(MODEL)/dump_entry$o \

   108 +	$(MODEL)/comp_parse$o

   109  

   110  infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)

   111  	@ECHO_LD@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@

   112 Index: test/Makefile.in

   113 --- test/Makefile.in.orig	2012-05-29 10:39:26.000000000 +0200

   114 +++ test/Makefile.in	2012-05-29 10:39:27.000000000 +0200

   115 @@ -102,7 +102,7 @@

   116  LDFLAGS_PROFILE	= $(LDFLAGS) $(CFLAGS_PROFILE)

   117  LDFLAGS_SHARED	= $(LDFLAGS) $(CFLAGS_SHARED) @LD_SHARED_OPTS@

   118  

   119 -TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@

   120 +TEST_ARGS	= @TEST_ARGS@

   121  

   122  # use these for linking with all of the libraries

   123  LIBS_DEFAULT	= $(TEST_ARGS) @LIBS@ $(TEST_LIBS) $(MATH_LIB)

   124 @@ -117,7 +117,7 @@

   125  LDFLAGS_CURSES	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)

   126  

   127  # use these for linking with the tinfo library if we have it, or curses library if not

   128 -LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_LIBS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)

   129 +LIBS_TINFO	= @TINFO_LIBS@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)

   130  LDFLAGS_TINFO	= @TINFO_LDFLAGS@ $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)

   131  

   132  LINT		= @LINT@

   133 Index: test/programs

   134 --- test/programs.orig	2009-09-12 21:44:01.000000000 +0200

   135 +++ test/programs	2012-05-29 10:39:27.000000000 +0200

   136 @@ -38,7 +38,7 @@

   137  clip_printw	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	clip_printw

   138  color_set	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	color_set

   139  demo_altkeys	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_altkeys

   140 -demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey

   141 +demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey key_defined

   142  demo_forms	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	demo_forms edit_field

   143  demo_keyok	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_keyok

   144  demo_menus	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	demo_menus

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial