diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-04-15 13:07:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-04-15 16:40:52 +0100 |
| commit | 1098921996c81a4d6dc917bbc16d5f834ebf6728 (patch) | |
| tree | b3fecb1ac25b30de5acebcbd5ed412dd9be9e5c3 /external | |
| parent | 1ee570a4e625719f8bf270d372926c0d829ae6f0 (diff) | |
test pre 1.4.0 hunspell
Change-Id: Ied87b41ec02b993fd08ac13f325b9489b6f07456
Diffstat (limited to 'external')
| -rw-r--r-- | external/hunspell/UnpackedTarball_hunspell.mk | 2 | ||||
| -rw-r--r-- | external/hunspell/hunspell-windows.patch | 21 | ||||
| -rw-r--r-- | external/hunspell/ubsan.patch.0 | 11 |
3 files changed, 0 insertions, 34 deletions
diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 7ce4aea1435a..943e78830133 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 357272d17c00..000000000000 --- 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 af25d6a9c4b2..000000000000 --- 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, |