openpkg-packages/ncurses/ncurses.patch

NCurses determines the presence of the <stdbool.h> header during its
own build time but the result is used in a public header <curses.h>.
It cannot be assumed that the application building against this public
header <curses.h> also uses the same compiler NCurses was built with.
Hence the public header <curses.h> has to perform an own in-place check
for <stdbool.h>. This way NCurses can be build with OpenPKG's GCC 3.x
while an application could build against the provided <curses.h> with an
arbitrary C compiler (usually a non-GCC 3.x vendor compiler!).

Index: include/curses.h.in
--- include/curses.h.in.orig	2007-10-14 08:55:05 +0200
+++ include/curses.h.in	2007-10-14 08:55:05 +0200
@@ -69,7 +69,11 @@
  * User-definable tweak to disable the include of <stdbool.h>.
  */
 #ifndef NCURSES_ENABLE_STDBOOL_H
-#define NCURSES_ENABLE_STDBOOL_H @cf_cv_header_stdbool_h@
+#if defined(__STDC__) && (__STDC_VERSION__ >= 199901L) && !defined(__osf__)
+#define NCURSES_ENABLE_STDBOOL_H 1
+#else
+#define NCURSES_ENABLE_STDBOOL_H 0
+#endif
 #endif
 
 /*
Index: ncurses/Makefile.in
--- ncurses/Makefile.in.orig	2007-10-14 08:55:05 +0200
+++ ncurses/Makefile.in	2007-10-14 08:55:05 +0200
@@ -154,7 +154,7 @@
 	keys.list
 
 TEST_DEPS	= ../lib/@LIB_PREFIX@ncurses@DFT_DEP_SUFFIX@
-TEST_ARGS	= @LDFLAGS_STATIC@ @TEST_ARGS@ @LDFLAGS_SHARED@ 
+TEST_ARGS	= @TEST_ARGS@ @LDFLAGS_SHARED@ 
 TEST_LDFLAGS	= @LD_MODEL@ $(TEST_ARGS) @LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@
 
 TEST_PROGS = \
@@ -269,7 +269,8 @@
 	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DHASHDEBUG $(serial)/hashmap.c $(serial)/hardscroll.c $(TEST_LDFLAGS)
 
 lib_mvcur$x : $(serial)/lib_mvcur.c $(TEST_DEPS) \
-		../@DFT_OBJ_SUBDIR@/dump_entry$o
+		../@DFT_OBJ_SUBDIR@/dump_entry$o \
+		../@DFT_OBJ_SUBDIR@/comp_parse$o
 	@ECHO_LINK@ $(LIBTOOL_LINK) -o $@ $(CFLAGS_DEFAULT) -DNCURSES_TEST -I$(serial)/../../progs $(serial)/lib_mvcur.c ../@DFT_OBJ_SUBDIR@/dump_entry$o $(TEST_LDFLAGS)
 
 link_test$x : ./link_test.c $(TEST_DEPS) \
Index: progs/Makefile.in
--- progs/Makefile.in.orig	2007-10-14 08:55:05 +0200
+++ progs/Makefile.in	2007-10-14 09:18:48 +0200
@@ -109,10 +109,10 @@
 
 LDFLAGS_DEFAULT	= $(LDFLAGS_@DFT_UPR_MODEL@)
 
-LIBS_TIC	= @LDFLAGS_STATIC@ @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
+LIBS_TIC	= @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
 LDFLAGS_TIC	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TIC)
 
-LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
+LIBS_TINFO	= @TINFO_ARGS@ @LDFLAGS_SHARED@ @LD_MODEL@ @LIBS@
 LDFLAGS_TINFO	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
 
 LINT		= @LINT@
@@ -213,7 +213,8 @@
 
 DEPS_TIC = \
 	$(MODEL)/tic$o \
-	$(MODEL)/dump_entry$o
+	$(MODEL)/dump_entry$o \
+	$(MODEL)/comp_parse$o
 
 tic$x: $(DEPS_TIC) $(DEPS_CURSES) transform.h
 	@ECHO_LINK@ $(LINK) $(DEPS_TIC) $(LDFLAGS_TIC) -o $@
@@ -231,14 +232,16 @@
 	@ECHO_LINK@ $(LINK) $(DEPS_CLEAR) $(LDFLAGS_TINFO) -o $@
 
 DEPS_TPUT = \
-	$(MODEL)/tput$o
+	$(MODEL)/tput$o \
+	$(MODEL)/lib_tparm$o
 
 tput$x: $(DEPS_TPUT) $(DEPS_CURSES) transform.h
 	@ECHO_LINK@ $(LINK) $(DEPS_TPUT) $(LDFLAGS_TINFO) -o $@
 
 DEPS_INFOCMP = \
 	$(MODEL)/infocmp$o \
-	$(MODEL)/dump_entry$o
+	$(MODEL)/dump_entry$o \
+	$(MODEL)/comp_parse$o
 
 infocmp$x: $(DEPS_INFOCMP) $(DEPS_CURSES)
 	@ECHO_LINK@ $(LINK) $(DEPS_INFOCMP) $(LDFLAGS_TIC) -o $@
Index: tack/Makefile.in
--- tack/Makefile.in.orig	2006-12-17 16:58:32 +0100
+++ tack/Makefile.in	2007-10-14 08:55:05 +0200
@@ -93,7 +93,7 @@
 LOCAL_LIBDIR	= @top_builddir@/lib
 
 LD		= @LD@
-LINK		= @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
+LINK		= @LINK_PROGS@ $(LIBTOOL_LINK)
 LDFLAGS		= @EXTRA_LDFLAGS@ \
 		@TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
 
Index: tack/edit.c
--- tack/edit.c.orig	2006-06-24 23:22:42 +0200
+++ tack/edit.c	2007-10-14 08:55:05 +0200
@@ -33,6 +33,8 @@
 static void show_untested(struct test_list *, int *, int *);
 static void show_changed(struct test_list *, int *, int *);
 
+#define _nc_info_hash_table _nc_get_hash_table(0)
+
 #define SHOW_VALUE	1
 #define SHOW_EDIT	2
 #define SHOW_DELETE	3
Index: test/Makefile.in
--- test/Makefile.in.orig	2007-10-14 08:55:04 +0200
+++ test/Makefile.in	2007-10-14 08:55:05 +0200
@@ -98,7 +98,7 @@
 LDFLAGS_CURSES	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_CURSES)
 
 # use these for linking with the tinfo library if we have it, or curses library if not
-LIBS_TINFO	= @LDFLAGS_STATIC@ @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
+LIBS_TINFO	= @TINFO_ARGS@ @LDFLAGS_SHARED@ @LIBS@ $(TEST_LIBS) $(MATH_LIB)
 LDFLAGS_TINFO	= $(LDFLAGS_@DFT_UPR_MODEL@) $(LIBS_TINFO)
 
 LINT		= @LINT@
Index: test/programs
--- test/programs.orig	2007-10-14 08:55:04 +0200
+++ test/programs	2007-10-14 08:55:05 +0200
@@ -37,7 +37,7 @@
 chgat		$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	chgat
 color_set	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	color_set
 demo_altkeys	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_altkeys
-demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey
+demo_defkey	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_defkey key_defined
 demo_forms	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	demo_forms edit_field
 demo_keyok	$(LDFLAGS_CURSES)	$(LOCAL_LIBS)	demo_keyok
 demo_menus	$(LDFLAGS_DEFAULT)	$(LOCAL_LIBS)	demo_menus