use enchant-2 instead of enchant

Bug-Debian: https://bugs.debian.org/956710
Last-Update: 2020-06-05

Last-Update: 2020-06-05
Gbp-Pq: Name enchant2.patch

diff --git a/configure.ac b/configure.ac
index e43663b2e91846b3508ab86b1812a65de0d14bc7..050f246e6690019df5bc7b83b294eaf210b94737 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ xp_pkgs="
 "
 
 # optional deps
-enchant_req='enchant >= 1.2.0'
+enchant_req='enchant-2 >= 1.2.0'
 gio_req='gio-2.0'
 goffice_req='libgoffice-0.10 >= 0.10.0'
 

diff --git a/src/af/xap/xp/enchant_checker.cpp b/src/af/xap/xp/enchant_checker.cpp
index ed97c1fb9f5b544ce4e8abce00c816641798f2eb..165de9800ebe665f0caca3f280ab1abbdf764781 100644 (file)
--- a/src/af/xap/xp/enchant_checker.cpp
+++ b/src/af/xap/xp/enchant_checker.cpp
@@ -127,7 +127,7 @@ EnchantChecker::_suggestWord (const UT_UCSChar *ucszWord, size_t len)
                                pvSugg->addItem (ucszSugg);
                }
 
-               enchant_dict_free_suggestions (m_dict, suggestions);
+               enchant_dict_free_string_list (m_dict, suggestions);
        }
 
        return pvSugg;
@@ -139,7 +139,7 @@ bool EnchantChecker::addToCustomDict (const UT_UCSChar *word, size_t len)
 
        if (word && len) {
                UT_UTF8String utf8 (word, len);
-               enchant_dict_add_to_personal (m_dict, utf8.utf8_str(), utf8.byteLength());
+               enchant_dict_add (m_dict, utf8.utf8_str(), utf8.byteLength());
                return true;
        }
        return false;
@@ -150,7 +150,7 @@ bool EnchantChecker::isIgnored (const UT_UCSChar *toCorrect, size_t toCorrectLen
        UT_return_val_if_fail (m_dict, false);
 
        UT_UTF8String ignore (toCorrect, toCorrectLen);
-       return enchant_dict_is_in_session (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
+       return enchant_dict_is_added (m_dict, ignore.utf8_str(), ignore.byteLength()) != 0;
 }
 
 void EnchantChecker::ignoreWord (const UT_UCSChar *toCorrect, size_t toCorrectLen)