6 files changed, 147 insertions, 0 deletions
diff --git a/hunspell/hunspell-solaris.patch b/hunspell/hunspell-solaris.patch
new file mode 100644
index 000000000000..37c5101364b4
--- /dev/null
+++ b/hunspell/hunspell-solaris.patch
@@ -0,0 +1,12 @@
+--- misc/hunspell-1.2.9.orig/src/tools/hunspell.cxx	2010-02-27 23:42:05.000000000 +0000
++++ misc/build/hunspell-1.2.9/src/tools/hunspell.cxx	2010-02-27 23:43:02.000000000 +0000
+@@ -10,6 +10,9 @@
+ #include "hunspell.hxx"
+ #include "csutil.hxx"
+ 
++// switch off iconv support for tests (fixing Solaris problems)
++#undef HAVE_ICONV
++
+ #ifndef HUNSPELL_EXTRA
+ #define suggest_auto suggest
+ #endif
diff --git a/hunspell/hunspell-stacksmash.patch b/hunspell/hunspell-stacksmash.patch
new file mode 100644
index 000000000000..8765b6d784d3
--- /dev/null
+++ b/hunspell/hunspell-stacksmash.patch
@@ -0,0 +1,28 @@
+--- misc/hunspell-1.2.9/src/hunspell/hunspell.cxx	2010-03-04 10:25:06.000000000 +0000
++++ misc/build/hunspell-1.2.9/src/hunspell/hunspell.cxx	2010-03-04 10:25:38.000000000 +0000
+@@ -1665,7 +1665,7 @@
+   if (!q2) return 0; // bad XML input
+   if (check_xml_par(q, "type=", "analyze")) {
+       int n = 0, s = 0;
+-      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) n = analyze(slst, cw);
++      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) n = analyze(slst, cw);
+       if (n == 0) return 0;
+       // convert the result to <code><a>ana1</a><a>ana2</a></code> format
+       for (int i = 0; i < n; i++) s+= strlen((*slst)[i]);
+@@ -1686,13 +1686,13 @@
+       (*slst)[0] = r;
+       return 1;
+   } else if (check_xml_par(q, "type=", "stem")) {
+-      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN)) return stem(slst, cw);
++      if (get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1)) return stem(slst, cw);
+   } else if (check_xml_par(q, "type=", "generate")) {
+-      int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN);
++      int n = get_xml_par(cw, strchr(q2, '>'), MAXWORDUTF8LEN - 1);
+       if (n == 0) return 0;
+       char * q3 = strstr(q2 + 1, "<word");
+       if (q3) {
+-        if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN)) {
++        if (get_xml_par(cw2, strchr(q3, '>'), MAXWORDUTF8LEN - 1)) {
+             return generate(slst, cw, cw2);
+         }
+       } else {
diff --git a/hunspell/hunspell-wntconfig.patch b/hunspell/hunspell-wntconfig.patch
new file mode 100644
index 000000000000..9b6bc9c3fbb2
--- /dev/null
+++ b/hunspell/hunspell-wntconfig.patch
@@ -0,0 +1,4 @@
+--- misc/hunspell-1.2.9/config.h	2010-02-25 14:38:38.000000000 +0000
++++ misc/build/hunspell-1.2.9/config.h	2010-02-25 14:38:42.000000000 +0000
+@@ -1 +0,0 @@
+-dummy
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
new file mode 100644
index 000000000000..f58204a33bc5
--- /dev/null
+++ b/hunspell/makefile.mk
@@ -0,0 +1,95 @@
+#*************************************************************************
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+# 
+# Copyright 2000, 2010 Oracle and/or its affiliates.
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# This file is part of OpenOffice.org.
+#
+# OpenOffice.org is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License version 3
+# only, as published by the Free Software Foundation.
+#
+# OpenOffice.org is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License version 3 for more details
+# (a copy is included in the LICENSE file that accompanied this code).
+#
+# You should have received a copy of the GNU Lesser General Public License
+# version 3 along with OpenOffice.org.  If not, see
+# <http://www.openoffice.org/license.html>
+# for a copy of the LGPLv3 License.
+#
+#*************************************************************************
+
+PRJ=.
+
+PRJNAME=hunspell
+TARGET=hunspell
+
+# --- Settings -----------------------------------------------------
+
+.INCLUDE :	settings.mk
+
+# --- Files --------------------------------------------------------
+
+TARFILE_NAME=hunspell-1.2.9
+TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
+ADDITIONAL_FILES+=config.h
+
+PATCH_FILES=\
+    hunspell-wntconfig.patch \
+    hunspell-solaris.patch \
+    hunspell-stacksmash.patch
+
+.IF "$(GUI)"=="UNX"
+
+#relative to CONFIGURE_DIR
+CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) configure
+CONFIGURE_FLAGS= --disable-shared --with-pic
+.IF "$(COMNAME)"=="sunpro5"
+CONFIGURE_FLAGS+= CFLAGS=-xc99=none
+.ENDIF                  # "$(COMNAME)"=="sunpro5"
+
+.IF "$(SYSBASE)"!=""
+.IF "$(EXTRA_CFLAGS)"!=""
+CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
+.ENDIF # "$(EXTRA_CFLAGS)"!=""
+.ELIF "$(OS)"=="MACOSX" # "$(SYSBASE)"!=""
+CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
+.ENDIF
+
+BUILD_ACTION=make && make check
+
+OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
+
+.ENDIF # "$(GUI)"=="UNX"
+
+
+.IF "$(GUI)"=="WNT"
+.IF "$(COM)"=="GCC"
+CONFIGURE_ACTION=configure
+CONFIGURE_FLAGS= --disable-shared --with-pic
+BUILD_ACTION=make
+OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
+.ELSE
+BUILD_ACTION=cd src/hunspell && dmake
+.ENDIF
+.ENDIF # "$(GUI)"=="WNT"
+
+.IF "$(GUI)"=="OS2"
+BUILD_ACTION=cd src/hunspell && dmake
+.ENDIF # "$(GUI)"=="OS2"
+
+OUT2INC= \
+    $(BUILD_DIR)$/src$/hunspell$/*.hxx
+
+# --- Targets ------------------------------------------------------
+
+.INCLUDE : set_ext.mk
+.INCLUDE : target.mk
+.INCLUDE : tg_ext.mk
+
diff --git a/hunspell/prj/build.lst b/hunspell/prj/build.lst
new file mode 100644
index 000000000000..ea87500d1d6d
--- /dev/null
+++ b/hunspell/prj/build.lst
@@ -0,0 +1,3 @@
+hun     hunspell        :       solenv ICU:icu NULL
+hun     hunspell              usr1    -       all hun_mkout NULL
+hun     hunspell              nmake   -       all hun_hunspell NULL
diff --git a/hunspell/prj/d.lst b/hunspell/prj/d.lst
new file mode 100644
index 000000000000..a323ce9f6344
--- /dev/null
+++ b/hunspell/prj/d.lst
@@ -0,0 +1,5 @@
+..\%__SRC%\lib\lib*.*        %_DEST%\lib%_EXT%\lib*.*
+..\%__SRC%\slb\libhunspell.lib        %_DEST%\lib%_EXT%\libhunspell.lib
+
+mkdir: %_DEST%\inc%_EXT%\hunspell
+..\%__SRC%\inc\*.hxx         %_DEST%\inc%_EXT%\hunspell\*.hxx