[Libreoffice-commits] core.git: configure.ac download.lst external/hunspell

[Caolán McNamara]

 configure.ac                                  |    4 ++--
 download.lst                                  |    2 +-
 external/hunspell/UnpackedTarball_hunspell.mk |    2 --
 external/hunspell/hunspell-windows.patch      |   21 ---------------------
 external/hunspell/ubsan.patch.0               |   11 -----------
 5 files changed, 3 insertions(+), 37 deletions(-)

New commits:
commit 1098921996c81a4d6dc917bbc16d5f834ebf6728
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 15 13:07:55 2016 +0100

    test pre 1.4.0 hunspell
    
    Change-Id: Ied87b41ec02b993fd08ac13f325b9489b6f07456

diff --git a/configure.ac b/configure.ac
index 028a22d..3c61c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9567,7 +9567,7 @@ if test "$with_system_hunspell" = "yes"; then
         HUNSPELL_LIBS=-lhunspell
     fi
     AC_LANG_POP([C++])
-    libo_MINGW_CHECK_DLL([libhunspell-1.3])
+    libo_MINGW_CHECK_DLL([libhunspell-1.4])
     HUNSPELL_CFLAGS=$(printf '%s' "$HUNSPELL_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
     FilterLibs "${HUNSPELL_LIBS}"
     HUNSPELL_LIBS="${filteredlibs}"
@@ -9578,7 +9578,7 @@ else
     if test "$COM" = "MSC"; then
         HUNSPELL_LIBS="${WORKDIR}/LinkTarget/StaticLibrary/hunspell.lib"
     else
-        HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs -lhunspell-1.3"
+        HUNSPELL_LIBS="-L${WORKDIR}/UnpackedTarball/hunspell/src/hunspell/.libs -lhunspell-1.4"
     fi
     BUILD_TYPE="$BUILD_TYPE HUNSPELL"
 fi
diff --git a/download.lst b/download.lst
index 133433e..19f727f 100644
--- a/download.lst
+++ b/download.lst
@@ -61,7 +61,7 @@ export GRAPHITE_TARBALL := 4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.
 export HARFBUZZ_MD5SUM := 0e27e531f4c4acff601ebff0957755c2
 export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2
 export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
-export HUNSPELL_TARBALL := 423cff69e68c87ac11e4aa8462951954-hunspell-1.3.4.tar.gz
+export HUNSPELL_TARBALL := 29de3467b11bde5a7743a93abeb8c0c8-hunspell-1.4.0.tar.gz
 export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
 export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
 export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk
index 7ce4aea..943e788 100644
--- a/external/hunspell/UnpackedTarball_hunspell.mk
+++ b/external/hunspell/UnpackedTarball_hunspell.mk
@@ -13,8 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
 	external/hunspell/hunspell-solaris.patch \
-	external/hunspell/hunspell-windows.patch \
-	external/hunspell/ubsan.patch.0 \
 ))
 
 ifeq ($(COM),MSC)
diff --git a/external/hunspell/hunspell-windows.patch b/external/hunspell/hunspell-windows.patch
deleted file mode 100644
index 357272d..0000000
--- a/external/hunspell/hunspell-windows.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- /dev/null	2016-03-15 09:11:25.292954614 +0000
-+++ misc/hunspell-1.3.4/src/hunspell/hunvisapi.h	2016-04-06 16:40:47.181698825 +0100
-@@ -0,0 +1,18 @@
-+#ifndef _HUNSPELL_VISIBILITY_H_
-+#define _HUNSPELL_VISIBILITY_H_
-+
-+#if defined(HUNSPELL_STATIC)
-+#  define LIBHUNSPELL_DLL_EXPORTED
-+#elif defined(_MSC_VER)
-+#  if defined(BUILDING_LIBHUNSPELL)
-+#    define LIBHUNSPELL_DLL_EXPORTED __declspec(dllexport)
-+#  else
-+#    define LIBHUNSPELL_DLL_EXPORTED __declspec(dllimport)
-+#  endif
-+#elif defined(BUILDING_LIBHUNSPELL) && 1
-+#  define LIBHUNSPELL_DLL_EXPORTED __attribute__((__visibility__("default")))
-+#else
-+#  define LIBHUNSPELL_DLL_EXPORTED
-+#endif
-+
-+#endif
diff --git a/external/hunspell/ubsan.patch.0 b/external/hunspell/ubsan.patch.0
deleted file mode 100644
index af25d6a..0000000
--- a/external/hunspell/ubsan.patch.0
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hunspell/csutil.cxx
-+++ src/hunspell/csutil.cxx
-@@ -281,7 +281,7 @@
-           u2->h = ((*u8 & 0x0f) << 4) + ((*(u8 + 1) & 0x3f) >> 2);
-           u8++;
-           if ((*(u8 + 1) & 0xc0) == 0x80) {
--            u2->l = (*u8 << 6) + (*(u8 + 1) & 0x3f);
-+            u2->l = (static_cast<unsigned char>(*u8) << 6) + (*(u8 + 1) & 0x3f);
-             u8++;
-           } else {
-             HUNSPELL_WARNING(stderr,