diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-04-16 15:05:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-04-18 09:32:39 +0100 |
| commit | 072b32442e3f6f220936a93ad1fcbde57746b747 (patch) | |
| tree | e8ee5a3c85456bca8a2995707b377c611764d586 /external | |
| parent | 0ef6945b494ee86ed601fb9b09613cb4825040b1 (diff) | |
try next hunspell 1.4.0 prerelease milestone
try using reverse iterators here then
and remove dictmgr which we don't seem to use or need
Change-Id: I981fccc4ca7562d5ab707dc2f605e409169dec07
Diffstat (limited to 'external')
| -rw-r--r-- | external/hunspell/StaticLibrary_hunspell.mk | 1 | ||||
| -rw-r--r-- | external/hunspell/UnpackedTarball_hunspell.mk | 1 | ||||
| -rw-r--r-- | external/hunspell/hunspell-iterator.patch.1 | 22 |
3 files changed, 0 insertions, 24 deletions
diff --git a/external/hunspell/StaticLibrary_hunspell.mk b/external/hunspell/StaticLibrary_hunspell.mk index 29fe6249d37f..d69e5a5a3adc 100644 --- a/external/hunspell/StaticLibrary_hunspell.mk +++ b/external/hunspell/StaticLibrary_hunspell.mk @@ -23,7 +23,6 @@ $(eval $(call gb_StaticLibrary_add_defs,hunspell,\ $(eval $(call gb_StaticLibrary_add_generated_cxxobjects,hunspell,\ UnpackedTarball/hunspell/src/hunspell/affentry \ UnpackedTarball/hunspell/src/hunspell/affixmgr \ - UnpackedTarball/hunspell/src/hunspell/dictmgr \ UnpackedTarball/hunspell/src/hunspell/csutil \ UnpackedTarball/hunspell/src/hunspell/hashmgr \ UnpackedTarball/hunspell/src/hunspell/suggestmgr \ diff --git a/external/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 3aae5798af0e..943e78830133 100644 --- a/external/hunspell/UnpackedTarball_hunspell.mk +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -13,7 +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-iterator.patch.1 \ )) ifeq ($(COM),MSC) diff --git a/external/hunspell/hunspell-iterator.patch.1 b/external/hunspell/hunspell-iterator.patch.1 deleted file mode 100644 index 046d6e0063a4..000000000000 --- a/external/hunspell/hunspell-iterator.patch.1 +++ /dev/null @@ -1,22 +0,0 @@ -MSVC debug runtime iterators don't want to be decremented past begin() - ---- hunspell/src/hunspell/affixmgr.cxx.orig 2016-04-15 23:30:37.555875079 +0200 -+++ hunspell/src/hunspell/affixmgr.cxx 2016-04-15 23:30:43.669875027 +0200 -@@ -4638,7 +4638,7 @@ - return; - - int neg = 0; -- for (std::string::iterator k = piece.begin() + piece.size() - 1; k >= piece.begin(); --k) { -+ for (std::string::iterator k = piece.begin() + piece.size() - 1; ; --k) { - switch (*k) { - case '[': { - if (neg) -@@ -4666,6 +4666,8 @@ - *(k + 1) = *k; - } - } -+ if (k == piece.begin()) -+ break; - } - } - |