hunspell: upgrade to 1.7.4
fix_morphological_analysis_for_compound_words.patch has been fixed upstream Downloaded from https://github.com/hunspell/hunspell/releases/download/v1.7.4/hunspell-1.7.4.tar.gz Change-Id: I1e7aa61437cb301d50913737f0ba0ce7fe612e2d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/211503 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
This commit is contained in:
+2
-2
@@ -302,8 +302,8 @@ HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
|
||||
# three static lines
|
||||
# so that git cherry-pick
|
||||
# will not run into conflicts
|
||||
HUNSPELL_SHA256SUM := 433274dac0619cb00c2e18b43a3dd3a9d50da5b5613fa9b5c21781e35dd76bc1
|
||||
HUNSPELL_TARBALL := hunspell-1.7.3.tar.gz
|
||||
HUNSPELL_SHA256SUM := 66ec82a577395fe9d471504267e6dd04615c76517c61af7c6b9c19e5e34e73c8
|
||||
HUNSPELL_TARBALL := hunspell-1.7.4.tar.gz
|
||||
# three static lines
|
||||
# so that git cherry-pick
|
||||
# will not run into conflicts
|
||||
|
||||
+1
@@ -33,6 +33,7 @@ $(eval $(call gb_StaticLibrary_add_generated_exception_objects,hunspell,\
|
||||
UnpackedTarball/hunspell/src/hunspell/hashmgr \
|
||||
UnpackedTarball/hunspell/src/hunspell/suggestmgr \
|
||||
UnpackedTarball/hunspell/src/hunspell/phonet \
|
||||
UnpackedTarball/hunspell/src/hunspell/hunspelltrace \
|
||||
UnpackedTarball/hunspell/src/hunspell/hunzip \
|
||||
UnpackedTarball/hunspell/src/hunspell/filemgr \
|
||||
UnpackedTarball/hunspell/src/hunspell/replist \
|
||||
|
||||
@@ -19,9 +19,4 @@ $(eval $(call gb_UnpackedTarball_set_post_action,hunspell,\
|
||||
))
|
||||
endif
|
||||
|
||||
$(eval $(call gb_UnpackedTarball_add_patches,hunspell, \
|
||||
external/hunspell/fix_morphological_analysis_for_compound_words.patch \
|
||||
))
|
||||
|
||||
|
||||
# vim: set noet sw=4 ts=4:
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
--- a/src/hunspell/affixmgr.cxx 2026-05-04 16:31:57.000000000 +0200
|
||||
+++ b/src/hunspell/affixmgr.cxx 2026-09-16 00:10:58.854821764 +0200
|
||||
@@ -2338,10 +2338,10 @@
|
||||
p = affix_check_morph(st, 0, i, compoundmiddle);
|
||||
}
|
||||
}
|
||||
+ presult.push_back(MSEP_FLD);
|
||||
+ presult.append(MORPH_PART);
|
||||
+ presult.append(st, 0, i);
|
||||
if (!p.empty()) {
|
||||
- presult.push_back(MSEP_FLD);
|
||||
- presult.append(MORPH_PART);
|
||||
- presult.append(st, 0, i);
|
||||
line_uniq_app(p, MSEP_REC);
|
||||
presult.append(p);
|
||||
}
|
||||
@@ -2540,7 +2540,7 @@
|
||||
if (!rv && compoundend && !onlycpdrule) {
|
||||
sfx = nullptr;
|
||||
pfx = nullptr;
|
||||
- rv = affix_check(word, i, word.size() - i, compoundend);
|
||||
+ rv = affix_check(word, i, word.size() - i, compoundend, IN_CPD_END);
|
||||
}
|
||||
|
||||
if (!rv && !defcpdtable.empty() && words) {
|
||||
Reference in New Issue
Block a user