PATCH: ncurses-5.6-20070901 (tack/edit.c, tack/Makefile.in, dist.mk)

[Rajeev V. Pillai]

Hi Tom,

Ncurses-5.6-20070901 fails to compile on my system due to the following
reasons:

1. tack/edit.c uses _nc_info_hash_table instead of 
   _nc_get_hash_table(FALSE).

cd tack && make DESTDIR="" all
make[1]: Entering directory `/tmp/ncurses-5.6/tack'
compiling edit (obj_s)
../tack/edit.c: In function 'show_value':
../tack/edit.c:288: error: '_nc_info_hash_table' undeclared (first use in this 
function)
../tack/edit.c:288: error: (Each undeclared identifier is reported only once
../tack/edit.c:288: error: for each function it appears in.)
../tack/edit.c: In function 'get_string_cap_byname':
../tack/edit.c:389: error: '_nc_info_hash_table' undeclared (first use in this 
function)
../tack/edit.c: In function 'mark_cap':
../tack/edit.c:540: error: '_nc_info_hash_table' undeclared (first use in this 
function)
../tack/edit.c: In function 'cap_index':
../tack/edit.c:619: error: '_nc_info_hash_table' undeclared (first use in this 
function)
../tack/edit.c: In function 'edit_init':
../tack/edit.c:819: error: '_nc_info_hash_table' undeclared (first use in this 
function)
../tack/edit.c: In function 'change_one_entry':
../tack/edit.c:862: error: '_nc_info_hash_table' undeclared (first use in this 
function)
make[1]: *** [../obj_s/edit.o] Error 1
make[1]: Leaving directory `/tmp/ncurses-5.6/tack'
make: *** [all] Error 2

2. tack/Makefile.in uses: @LINK_PROGS@ $(LIBTOOL_LINK) $(CC)
   instead of  @LINK_PROGS@ $(LIBTOOL_LINK).

cd tack && make DESTDIR="" all
make[1]: Entering directory `/tmp/ncurses-5.6/tack'
linking tack ...
gcc: gcc: No such file or directory
make[1]: *** [tack] Error 1
make[1]: Leaving directory `/tmp/ncurses-5.6/tack'
make: *** [all] Error 2

3. The last change in my patch below is to fix the patch version in 
   dist.mk.




FYI:
====
Kernel  : Linux 2.6.22
libc    : glibc-2.5
gcc     : gcc-4.2.1
binutils: binutils-2.18


Thanks,
Rajeev

=====     Patch starts here =====
diff -urN ncurses-5.6-20070901.orig/dist.mk ncurses-5.6-20070901/dist.mk
--- ncurses-5.6-20070901.orig/dist.mk   2007-09-05 21:33:27.956625890 +0530
+++ ncurses-5.6-20070901/dist.mk        2007-09-05 21:37:50.916509554 +0530
@@ -37,7 +37,7 @@
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 6
-NCURSES_PATCH = 20070825
+NCURSES_PATCH = 20070901
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff -urN ncurses-5.6-20070901.orig/tack/Makefile.in 
ncurses-5.6-20070901/tack/Makefile.in
--- ncurses-5.6-20070901.orig/tack/Makefile.in  2007-09-05 21:33:24.457159585 
+0530
+++ ncurses-5.6-20070901/tack/Makefile.in       2007-09-05 21:34:10.450143066 
+0530
@@ -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@ \
                @TICS_ARGS@ @TINFO_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@
 
diff -urN ncurses-5.6-20070901.orig/tack/edit.c ncurses-5.6-20070901/tack/edit.c
--- ncurses-5.6-20070901.orig/tack/edit.c       2006-06-25 02:52:42.000000000 
+0530
+++ ncurses-5.6-20070901/tack/edit.c    2007-09-05 21:36:59.424365127 +0530
@@ -285,7 +285,7 @@
                put_clear();
        }
        op = t->flags & 255;
-       if ((nt = _nc_find_entry(buf, _nc_info_hash_table))) {
+       if ((nt = _nc_find_entry(buf, _nc_get_hash_table(FALSE)))) {
                switch (nt->nte_type) {
                case BOOLEAN:
                        if (op == SHOW_DELETE) {
@@ -386,7 +386,7 @@
 {
        struct name_table_entry const *nt;
 
-       if ((nt = _nc_find_entry(name, _nc_info_hash_table))) {
+       if ((nt = _nc_find_entry(name, _nc_get_hash_table(FALSE)))) {
                if (nt->nte_type == STRING) {
                        *long_name = strfnames[nt->nte_index];
                        return (CUR Strings[nt->nte_index]);
@@ -537,7 +537,7 @@
        struct name_table_entry const *nt;
 
        alloc_arrays();
-       if ((nt = _nc_find_entry(name, _nc_info_hash_table))) {
+       if ((nt = _nc_find_entry(name, _nc_get_hash_table(FALSE)))) {
                switch (nt->nte_type) {
                case BOOLEAN:
                        flag_boolean[nt->nte_index] |= flag;
@@ -616,7 +616,7 @@
                                if (j) {
                                        name[j] = '\0';
                                        if ((nt = _nc_find_entry(name,
-                                               _nc_info_hash_table)) &&
+                                               _nc_get_hash_table(FALSE))) &&
                                                (nt->nte_type == STRING)) {
                                                *inx++ = nt->nte_index;
                                        }
@@ -816,7 +816,7 @@
        /* Lookup the translated strings */
        for (i = 0; i < TM_last; i++) {
                if ((nt = _nc_find_entry(TM_string[i].name,
-                       _nc_info_hash_table)) && (nt->nte_type == STRING)) {
+                       _nc_get_hash_table(FALSE))) && (nt->nte_type == 
STRING)) {
                        TM_string[i].index = nt->nte_index;
                } else {
                        sprintf(temp, "TM_string lookup failed for: %s",
@@ -824,7 +824,7 @@
                        ptextln(temp);
                }
        }
-       if ((nt = _nc_find_entry("xon", _nc_info_hash_table)) != 0) {
+       if ((nt = _nc_find_entry("xon", _nc_get_hash_table(FALSE))) != 0) {
                xon_index = nt->nte_index;
        }
        xon_shadow = xon_xoff;
@@ -859,7 +859,7 @@
                        *chp = pad[0];
                        return;
                }
-               if ((nt = _nc_find_entry(pad, _nc_info_hash_table)) &&
+               if ((nt = _nc_find_entry(pad, _nc_get_hash_table(FALSE))) &&
                        (nt->nte_type == STRING)) {
                        x = nt->nte_index;
                        current_string = CUR Strings[x];
=====     Patch ends here   =====

ncurses-5.6-20070901.diff
Description: patch for ncurses-5.6-20070901