[patch] Fixes to allow hunspell to build on IRIX

hunspell-1.2.8.patch (text/plain), 8.45 KB, created by Stuart Shelton on 2009-02-05 15:03:48 UTC

--- hunspell-1.2.8/src/tools/Makefile.am.dist	2009-02-05 14:30:32.681311560 +0000
+++ hunspell-1.2.8/src/tools/Makefile.am	2009-02-05 14:28:18.055216040 +0000
@@ -14,14 +14,14 @@ hunspell_example_SOURCES=example.cxx
 hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
 
 hunspell_SOURCES=hunspell.cxx
-hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \
-	../parsers/libparsers.a @CURSESLIB@ @READLINELIB@
+hunspell_LDADD = @LIBINTL@ ../parsers/libparsers.a \
+	../hunspell/libhunspell-1.2.la @CURSESLIB@ @READLINELIB@
 
 hunspell_analyze_SOURCES=analyze.cxx
 hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
 
 hunspell_chmorph_SOURCES=chmorph.cxx
-hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
 
 noinst_PROGRAMS=hunspell-example
 
--- hunspell-1.2.8/src/tools/Makefile.in.dist	2009-02-05 14:23:50.157526920 +0000
+++ hunspell-1.2.8/src/tools/Makefile.in	2009-02-05 14:32:28.771379880 +0000
@@ -59,15 +59,15 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_hunspell_OBJECTS = hunspell.$(OBJEXT)
 hunspell_OBJECTS = $(am_hunspell_OBJECTS)
-hunspell_DEPENDENCIES = ../hunspell/libhunspell-1.2.la \
-	../parsers/libparsers.a
+hunspell_DEPENDENCIES = ../parsers/libparsers.a \
+	../hunspell/libhunspell-1.2.la
 am_hunspell_analyze_OBJECTS = analyze.$(OBJEXT)
 hunspell_analyze_OBJECTS = $(am_hunspell_analyze_OBJECTS)
 hunspell_analyze_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
 am_hunspell_chmorph_OBJECTS = chmorph.$(OBJEXT)
 hunspell_chmorph_OBJECTS = $(am_hunspell_chmorph_OBJECTS)
-hunspell_chmorph_DEPENDENCIES = ../hunspell/libhunspell-1.2.la \
-	../parsers/libparsers.a
+hunspell_chmorph_DEPENDENCIES = ../parsers/libparsers.a \
+	../hunspell/libhunspell-1.2.la
 am_hunspell_example_OBJECTS = example.$(OBJEXT)
 hunspell_example_OBJECTS = $(am_hunspell_example_OBJECTS)
 hunspell_example_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
@@ -274,13 +274,13 @@ include_HEADERS = munch.h unmunch.h
 hunspell_example_SOURCES = example.cxx
 hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
 hunspell_SOURCES = hunspell.cxx
-hunspell_LDADD = @LIBINTL@ ../hunspell/libhunspell-1.2.la \
-	../parsers/libparsers.a @CURSESLIB@ @READLINELIB@
+hunspell_LDADD = @LIBINTL@ ../parsers/libparsers.a \
+	../hunspell/libhunspell-1.2.la @CURSESLIB@ @READLINELIB@
 
 hunspell_analyze_SOURCES = analyze.cxx
 hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
 hunspell_chmorph_SOURCES = chmorph.cxx
-hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
 EXTRA_DIST = makealias affixcompress wordforms
 all: all-am
 
--- hunspell-1.2.8/src/tools/Makefile.dist	2009-02-05 14:22:57.442745560 +0000
+++ hunspell-1.2.8/src/tools/Makefile	2009-02-05 14:32:56.235160200 +0000
@@ -59,15 +59,15 @@ binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS)
 am_hunspell_OBJECTS = hunspell.$(OBJEXT)
 hunspell_OBJECTS = $(am_hunspell_OBJECTS)
-hunspell_DEPENDENCIES = ../hunspell/libhunspell-1.2.la \
-	../parsers/libparsers.a
+hunspell_DEPENDENCIES = ../parsers/libparsers.a \
+	../hunspell/libhunspell-1.2.la
 am_hunspell_analyze_OBJECTS = analyze.$(OBJEXT)
 hunspell_analyze_OBJECTS = $(am_hunspell_analyze_OBJECTS)
 hunspell_analyze_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
 am_hunspell_chmorph_OBJECTS = chmorph.$(OBJEXT)
 hunspell_chmorph_OBJECTS = $(am_hunspell_chmorph_OBJECTS)
-hunspell_chmorph_DEPENDENCIES = ../hunspell/libhunspell-1.2.la \
-	../parsers/libparsers.a
+hunspell_chmorph_DEPENDENCIES = ../parsers/libparsers.a \
+	../hunspell/libhunspell-1.2.la
 am_hunspell_example_OBJECTS = example.$(OBJEXT)
 hunspell_example_OBJECTS = $(am_hunspell_example_OBJECTS)
 hunspell_example_DEPENDENCIES = ../hunspell/libhunspell-1.2.la
@@ -274,13 +274,13 @@ include_HEADERS = munch.h unmunch.h
 hunspell_example_SOURCES = example.cxx
 hunspell_example_LDADD = ../hunspell/libhunspell-1.2.la
 hunspell_SOURCES = hunspell.cxx
-hunspell_LDADD = -lintl ../hunspell/libhunspell-1.2.la \
-	../parsers/libparsers.a -lncursesw -lreadline -lncurses
+hunspell_LDADD = -lintl ../parsers/libparsers.a \
+	../hunspell/libhunspell-1.2.la -lncursesw -lreadline -lncurses
 
 hunspell_analyze_SOURCES = analyze.cxx
 hunspell_analyze_LDADD = ../hunspell/libhunspell-1.2.la
 hunspell_chmorph_SOURCES = chmorph.cxx
-hunspell_chmorph_LDADD = ../hunspell/libhunspell-1.2.la ../parsers/libparsers.a
+hunspell_chmorph_LDADD = ../parsers/libparsers.a ../hunspell/libhunspell-1.2.la
 EXTRA_DIST = makealias affixcompress wordforms
 all: all-am
 
--- hunspell-1.2.8/src/hunspell/affixmgr.hxx.dist	2009-02-05 14:33:43.006180840 +0000
+++ hunspell-1.2.8/src/hunspell/affixmgr.hxx	2009-02-05 14:33:45.212640200 +0000
@@ -192,7 +192,7 @@ public:
   const char *        get_suffix();
   const char *        get_derived();
   const char *        get_version();
-  const int           have_contclass();
+  int                 have_contclass();
   int                 get_utf8();
   int                 get_complexprefixes();
   char *              get_suffixed(char );
--- src/hunspell/affixmgr.cxx.dist	2009-02-05 12:57:38.158407160 +0000
+++ src/hunspell/affixmgr.cxx	2009-02-05 12:59:12.647458920 +0000
@@ -3234,7 +3234,7 @@ struct hentry * AffixMgr::lookup(const c
 }
 
 // return the value of suffix
-const int AffixMgr::have_contclass()
+int AffixMgr::have_contclass()
 {
   return havecontclass;
 }
@@ -4276,7 +4276,7 @@ int AffixMgr::redundant_condition(char f
             if (strip[i] == cond[j]) in = 1;
           } while ((j < (condl - 1)) && (cond[j] != ']'));
           if (j == (condl - 1) && (cond[j] != ']')) {
-            HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum);
+            HUNSPELL_WARNING(stderr, "error: line %d: missing ] in condition:\n%s\n", linenum, cond);
             return 0;
           }
           if ((!neg && !in) || (neg && in)) {
@@ -4304,7 +4304,7 @@ int AffixMgr::redundant_condition(char f
             if (strip[i] == cond[j]) in = 1;
           } while ((j > 0) && (cond[j] != '['));
           if ((j == 0) && (cond[j] != '[')) {
-            HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum);
+            HUNSPELL_WARNING(stderr, "error: error: %d: missing ] in condition:\n%s\n", linenum, cond);
             return 0;
           }
           neg = (cond[j+1] == '^') ? 1 : 0;
--- hunspell-1.2.8/src/hunspell/phonet.cxx.dist	2009-02-05 13:43:27.813822600 +0000
+++ hunspell-1.2.8/src/hunspell/phonet.cxx	2009-02-05 13:47:29.150975560 +0000
@@ -32,12 +32,11 @@
 #include <cstring>
 #include <cstdio>
 #include <cctype>
-#else
+#endif
 #include <stdlib.h> 
 #include <string.h>
 #include <stdio.h> 
 #include <ctype.h>
-#endif
 
 #include "csutil.hxx"
 #include "phonet.hxx"
--- hunspell-1.2.8/src/hunspell/filemgr.cxx.dist	2009-02-05 13:45:14.259471720 +0000
+++ hunspell-1.2.8/src/hunspell/filemgr.cxx	2009-02-05 13:46:02.296964680 +0000
@@ -5,11 +5,10 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
-#else
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#endif
 
 #include "filemgr.hxx"
 
--- hunspell-1.2.8/src/hunspell/hunzip.cxx.dist	2009-02-05 13:47:53.669547480 +0000
+++ hunspell-1.2.8/src/hunspell/hunzip.cxx	2009-02-05 13:48:10.032671320 +0000
@@ -2,11 +2,10 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
-#else
+#endif
 #include <stdlib.h> 
 #include <string.h>
 #include <stdio.h> 
-#endif
 
 #include "hunzip.hxx"
 
--- hunspell-1.2.8/src/hunspell/replist.cxx.dist	2009-02-05 14:13:19.840736440 +0000
+++ hunspell-1.2.8/src/hunspell/replist.cxx	2009-02-05 14:13:42.324182520 +0000
@@ -5,11 +5,10 @@
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
-#else
+#endif
 #include <stdlib.h>
 #include <string.h>
 #include <stdio.h>
-#endif
 
 #include "replist.hxx"
 #include "csutil.hxx"
--- hunspell-1.2.8/src/tools/hunspell.cxx.dist	2009-02-05 14:35:25.990581080 +0000
+++ hunspell-1.2.8/src/tools/hunspell.cxx	2009-02-05 14:36:12.561023560 +0000
@@ -11,6 +11,9 @@
 #include "hunspell.hxx"
 #include "csutil.hxx"
 
+#include <stdlib.h>
+#include <stdio.h>
+
 #ifndef HUNSPELL_EXTRA
 #define suggest_auto suggest
 #endif
--- hunspell-1.2.8/tests/test.sh.dist	2009-02-05 14:40:51.030393080 +0000
+++ hunspell-1.2.8/tests/test.sh	2009-02-05 14:41:01.908655880 +0000
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/opt/gentoo/bin/bash
 export LC_ALL="C"
 
 function check_valgrind_log () {