1 files changed, 16 insertions, 10 deletions
diff --git a/hunspell/makefile.mk b/hunspell/makefile.mk
index 7b2bc84e0789..a682ba05e4fc 100644
--- a/hunspell/makefile.mk
+++ b/hunspell/makefile.mk
@@ -36,24 +36,29 @@ TARGET=hunspell
 
 # --- Files --------------------------------------------------------
 
-TARFILE_NAME=hunspell-1.2.9
-TARFILE_MD5=68dd2e8253d9a7930e9fd50e2d7220d0
+TARFILE_NAME=hunspell-1.3.1
+TARFILE_MD5=9ed97fce60a9a65852402248a6659492
 ADDITIONAL_FILES+=config.h
 
 PATCH_FILES=\
+    hunspell-static.patch \
     hunspell-wntconfig.patch \
     hunspell-solaris.patch \
-    hunspell-stacksmash.patch
+    hunspell-android.patch
 
 .IF "$(GUI)"=="UNX"
 
 #relative to CONFIGURE_DIR
 CONFIGURE_ACTION=$(AUGMENT_LIBRARY_PATH) configure
-CONFIGURE_FLAGS= --disable-shared --with-pic
+CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic
 .IF "$(COMNAME)"=="sunpro5"
 CONFIGURE_FLAGS+= CFLAGS=-xc99=none
 .ENDIF                  # "$(COMNAME)"=="sunpro5"
 
+.IF "$(OS)"=="AIX"
+CONFIGURE_FLAGS+= CFLAGS=-D_LINUX_SOURCE_COMPAT
+.ENDIF
+
 .IF "$(SYSBASE)"!=""
 .IF "$(EXTRA_CFLAGS)"!=""
 CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
@@ -62,6 +67,10 @@ CONFIGURE_FLAGS+= CFLAGS="$(EXTRA_CFLAGS)" CXXFLAGS="$(EXTRA_CFLAGS)"
 CONFIGURE_FLAGS+=CPPFLAGS="$(EXTRA_CDEFS)"
 .ENDIF
 
+.IF "$(CROSS_COMPILING)"=="YES"
+CONFIGURE_FLAGS+=--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)
+.ENDIF
+
 BUILD_ACTION=$(GNUMAKE) -j$(EXTMAXPROCESS)
 
 OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
@@ -75,7 +84,7 @@ PATCH_FILES=\
     hunspell-mingw.patch
 
 CONFIGURE_ACTION=configure
-CONFIGURE_FLAGS= --disable-shared --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
+CONFIGURE_FLAGS= --disable-shared --disable-nls --with-pic LDFLAGS=-Wl,--enable-runtime-pseudo-reloc-v2
 BUILD_ACTION=make
 OUT2LIB=$(BUILD_DIR)$/src$/hunspell$/.libs$/libhunspell-1.2.a
 .ELSE
@@ -83,12 +92,9 @@ 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
+    $(BUILD_DIR)$/src$/hunspell$/*.hxx \
+    $(BUILD_DIR)$/src$/hunspell$/*.h
 
 # --- Targets ------------------------------------------------------