mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

try next hunspell 1.4.0 prerelease milestone

Browse Source 
try using reverse iterators here then

and remove dictmgr which we don't seem to use or need

Change-Id: I981fccc4ca7562d5ab707dc2f605e409169dec07
This commit is contained in:
Caolán McNamara
2016-04-16 15:05:55 +01:00
parent 0ef6945b49
commit 072b32442e
5 changed files with 1 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
download.lst
View File

@@ -61,7 +61,7 @@ export GRAPHITE_TARBALL := 4311dd9ace498b57c85f611e0670df64-graphite2-minimal-1.
export HARFBUZZ_MD5SUM := 0e27e531f4c4acff601ebff0957755c2 export HARFBUZZ_MD5SUM := 0e27e531f4c4acff601ebff0957755c2
export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2 export HARFBUZZ_TARBALL := harfbuzz-0.9.40.tar.bz2
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_TARBALL := 29de3467b11bde5a7743a93abeb8c0c8-hunspell-1.4.0.tar.gz export HUNSPELL_TARBALL := f95a5452e064fac41c85a70bba1728c5-hunspell-1.4.0.tar.gz
export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz export HYPHEN_TARBALL := 5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz
export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz export ICU_TARBALL := 976734806026a4ef8bdd17937c8898b9-icu4c-57_1-src.tgz
export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip export JFREEREPORT_FLOW_ENGINE_TARBALL := ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip

1
external/hunspell/StaticLibrary_hunspell.mk vendored
View File

@@ -23,7 +23,6 @@ $(eval $(call gb_StaticLibrary_add_defs,hunspell,\
$(eval $(call gb_StaticLibrary_add_generated_cxxobjects,hunspell,\ $(eval $(call gb_StaticLibrary_add_generated_cxxobjects,hunspell,\
UnpackedTarball/hunspell/src/hunspell/affentry \ UnpackedTarball/hunspell/src/hunspell/affentry \
UnpackedTarball/hunspell/src/hunspell/affixmgr \ UnpackedTarball/hunspell/src/hunspell/affixmgr \
UnpackedTarball/hunspell/src/hunspell/dictmgr \
UnpackedTarball/hunspell/src/hunspell/csutil \ UnpackedTarball/hunspell/src/hunspell/csutil \
UnpackedTarball/hunspell/src/hunspell/hashmgr \ UnpackedTarball/hunspell/src/hunspell/hashmgr \
UnpackedTarball/hunspell/src/hunspell/suggestmgr \ UnpackedTarball/hunspell/src/hunspell/suggestmgr \

1
external/hunspell/UnpackedTarball_hunspell.mk vendored
View File

@@ -13,7 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,hunspell,\ $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\
external/hunspell/hunspell-solaris.patch \ external/hunspell/hunspell-solaris.patch \
external/hunspell/hunspell-iterator.patch.1 \
)) ))
ifeq ($(COM),MSC) ifeq ($(COM),MSC)

22
external/hunspell/hunspell-iterator.patch.1 vendored
View File

@@ -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;
}
}

1
lingucomponent/source/spellcheck/spell/sspellimp.cxx
View File

@@ -31,7 +31,6 @@
#include <lingutil.hxx> #include <lingutil.hxx>
#include <hunspell.hxx> #include <hunspell.hxx>
#include <dictmgr.hxx>
#include <sspellimp.hxx> #include <sspellimp.hxx>
#include <linguistic/lngprops.hxx> #include <linguistic/lngprops.hxx>