fix build

4 files changed, 372 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 976f1f284d36..5329957bfdbc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -22,7 +22,7 @@ pkgbase = librime-sbxlm-git
 	depends = marisa
 	provides = librime
 	conflicts = librime
-	source = 0001-fix-opencc-1.1.0-failed.patch
+	source = 0001-fix-build.patch
 	source = git://github.com/sbxlmdsl/librime.git#commit=6a8d183dd1345a96f66bc74f0bc222e1b342cfc0
 	source = https://github.com/lotem/librime-octagram/archive/f92e083052b9983ee3cbddcda5ed60bb3c068e24/librime-octagram-f92e083052b9983ee3cbddcda5ed60bb3c068e24.tar.gz
 	source = https://github.com/hchunhui/librime-lua/archive/d45a41af2f9d731e3c1516a191cc3160e3cb8377/librime-lua-d45a41af2f9d731e3c1516a191cc3160e3cb8377.tar.gz
@@ -32,4 +32,3 @@ pkgbase = librime-sbxlm-git
 	sha512sums = 2a3d3b49d53066fe96dd008e8064718082225e6bf185574a25b8e98175d9936abcfa1fdc56e48f9c72a2deb46f8157d6132fd119ff8e0a3d52fbe9e2ea21386c
 
 pkgname = librime-sbxlm-git
-
diff --git a/0001-fix-build.patch b/0001-fix-build.patch
new file mode 100644
index 000000000000..254de401a643
--- /dev/null
+++ b/0001-fix-build.patch
@@ -0,0 +1,368 @@
+From 8fe647a911904e979059f268985bface2d7d79ae Mon Sep 17 00:00:00 2001
+From: noodlefighter <noodlefighter@gmail.com>
+Date: Thu, 29 Jul 2021 16:59:39 +0800
+Subject: [PATCH] fix build
+
+---
+ src/rime/gear/script_translator.cc |  1 +
+ src/rime/gear/simplifier.cc        |  2 +-
+ src/rime/gear/table_translator.cc  | 89 +++++++++++++++---------------
+ 3 files changed, 47 insertions(+), 45 deletions(-)
+
+diff --git a/src/rime/gear/script_translator.cc b/src/rime/gear/script_translator.cc
+index 00b4f11..caabf4e 100644
+--- a/src/rime/gear/script_translator.cc
++++ b/src/rime/gear/script_translator.cc
+@@ -23,6 +23,7 @@
+ #include <rime/gear/poet.h>
+ #include <rime/gear/script_translator.h>
+ #include <rime/gear/translator_commons.h>
++#include <cmath>
+ 
+ 
+ //static const char* quote_left = "\xef\xbc\x88";
+diff --git a/src/rime/gear/simplifier.cc b/src/rime/gear/simplifier.cc
+index 98a1c5a..171c415 100644
+--- a/src/rime/gear/simplifier.cc
++++ b/src/rime/gear/simplifier.cc
+@@ -54,7 +54,7 @@ class Opencc {
+       return false;
+     } else {
+       const opencc::DictEntry* entry = item.Get();
+-      for (const char* value : entry->Values()) {
++      for (auto value : entry->Values()) {
+         forms->push_back(value);
+       }
+       return forms->size() > 0;
+diff --git a/src/rime/gear/table_translator.cc b/src/rime/gear/table_translator.cc
+index 6ab6e54..27531d7 100644
+--- a/src/rime/gear/table_translator.cc
++++ b/src/rime/gear/table_translator.cc
+@@ -22,13 +22,14 @@
+ #include <rime/gear/table_translator.h>
+ #include <rime/gear/translator_commons.h>
+ #include <rime/gear/unity_table_encoder.h>
++#include <cmath>
+ 
+ namespace rime {
+-  
++
+   static const char* kUnitySymbol = " \xe2\x98\xaf ";
+-  
++
+   // TableTranslation
+-  
++
+   TableTranslation::TableTranslation(TranslatorOptions* options,
+                                      const Language* language,
+                                      const string& input,
+@@ -44,7 +45,7 @@ namespace rime {
+       options_->preedit_formatter().Apply(&preedit_);
+     CheckEmpty();
+   }
+-  
++
+   bool TableTranslation::Next() {
+     if (exhausted())
+       return false;
+@@ -60,11 +61,11 @@ namespace rime {
+     }
+     return !CheckEmpty();
+   }
+-  
++
+   static bool is_constructed(const DictEntry* e) {
+     return UnityTableEncoder::HasPrefix(e->custom_code);
+   }
+-  
++
+   an<Candidate> TableTranslation::Peek() {
+     if (exhausted())
+       return nullptr;
+@@ -87,13 +88,13 @@ namespace rime {
+     }
+     return phrase;
+   }
+-  
++
+   bool TableTranslation::CheckEmpty() {
+     bool is_empty = iter_.exhausted() && uter_.exhausted();
+     set_exhausted(is_empty);
+     return is_empty;
+   }
+-  
++
+   bool TableTranslation::PreferUserPhrase() {
+     if (uter_.exhausted())
+       return false;
+@@ -106,14 +107,14 @@ namespace rime {
+     else
+       return true;
+   }
+-  
++
+   // LazyTableTranslation
+-  
++
+   class LazyTableTranslation : public TableTranslation {
+   public:
+     static const size_t kInitialSearchLimit = 10;
+     static const size_t kExpandingFactor = 10;
+-    
++
+     LazyTableTranslation(TableTranslator* translator,
+                          const string& input,
+                          size_t start, size_t end,
+@@ -122,7 +123,7 @@ namespace rime {
+     bool FetchUserPhrases(TableTranslator* translator);
+     virtual bool FetchMoreUserPhrases();
+     virtual bool FetchMoreTableEntries();
+-    
++
+   private:
+     Dictionary* dict_;
+     UserDictionary* user_dict_;
+@@ -130,7 +131,7 @@ namespace rime {
+     size_t user_dict_limit_;
+     string user_dict_key_;
+   };
+-  
++
+   LazyTableTranslation::LazyTableTranslation(TableTranslator* translator,
+                                              const string& input,
+                                              size_t start, size_t end,
+@@ -146,7 +147,7 @@ namespace rime {
+     FetchMoreTableEntries();
+     CheckEmpty();
+   }
+-  
++
+   bool LazyTableTranslation::FetchUserPhrases(TableTranslator* translator) {
+     if (!user_dict_)
+       return false;
+@@ -158,7 +159,7 @@ namespace rime {
+     }
+     return !uter_.exhausted();
+   }
+-  
++
+   bool LazyTableTranslation::FetchMoreUserPhrases() {
+     if (!user_dict_ || user_dict_limit_ == 0)
+       return false;
+@@ -173,7 +174,7 @@ namespace rime {
+     }
+     return !uter_.exhausted();
+   }
+-  
++
+   bool LazyTableTranslation::FetchMoreTableEntries() {
+     if (!dict_ || limit_ == 0)
+       return false;
+@@ -197,9 +198,9 @@ namespace rime {
+     }
+     return true;
+   }
+-  
++
+   // TableTranslator
+-  
++
+   TableTranslator::TableTranslator(const Ticket& ticket)
+   : Translator(ticket),
+   Memory(ticket),
+@@ -233,30 +234,30 @@ namespace rime {
+       encoder_->Load(ticket);
+     }
+   }
+-  
++
+   static bool starts_with_completion(an<Translation> translation) {
+     if (!translation)
+       return false;
+     auto cand = translation->Peek();
+     return cand && cand->type() == "completion";
+   }
+-  
++
+   an<Translation> TableTranslator::Query(const string& input,
+                                          const Segment& segment) {
+     if (!segment.HasTag(tag_))
+       return nullptr;
+     DLOG(INFO) << "input = '" << input
+     << "', [" << segment.start << ", " << segment.end << ")";
+-    
++
+     FinishSession();
+-    
++
+     bool enable_user_dict = user_dict_ && user_dict_->loaded() &&
+     !IsUserDictDisabledFor(input);
+-    
++
+     const string& preedit(input);
+     string code = input;
+     boost::trim_right_if(code, boost::is_any_of(delimiters_));
+-    
++
+     an<Translation> translation;
+     if (enable_completion_) {
+       translation = Cached<LazyTableTranslation>(
+@@ -326,7 +327,7 @@ namespace rime {
+     }
+     return translation;
+   }
+-  
++
+   bool TableTranslator::Memorize(const CommitEntry& commit_entry) {
+     if (!user_dict_)
+       return false;
+@@ -400,20 +401,20 @@ namespace rime {
+     }
+     return true;
+   }
+-  
++
+   string TableTranslator::GetPrecedingText(size_t start) const {
+     return !contextual_suggestions_ ? string() :
+     start > 0 ? engine_->context()->composition().GetTextBefore(start) :
+     engine_->context()->commit_history().latest_text();
+   }
+-  
++
+   // SentenceSyllabifier
+-  
++
+   class SentenceSyllabifier : public PhraseSyllabifier {
+   public:
+     virtual Spans Syllabify(const Phrase* phrase);
+   };
+-  
++
+   Spans SentenceSyllabifier::Syllabify(const Phrase* phrase) {
+     Spans result;
+     if (auto sentence = dynamic_cast<const Sentence*>(phrase)) {
+@@ -426,9 +427,9 @@ namespace rime {
+     }
+     return result;
+   }
+-  
++
+   // SentenceTranslation
+-  
++
+   class SentenceTranslation : public Translation {
+   public:
+     SentenceTranslation(TableTranslator* translator,
+@@ -439,12 +440,12 @@ namespace rime {
+                         size_t start);
+     virtual bool Next();
+     virtual an<Candidate> Peek();
+-    
++
+   protected:
+     void PrepareSentence();
+     bool CheckEmpty();
+     bool PreferUserPhrase() const;
+-    
++
+     TableTranslator* translator_;
+     an<Sentence> sentence_;
+     DictEntryCollector collector_;
+@@ -453,7 +454,7 @@ namespace rime {
+     string input_;
+     size_t start_;
+   };
+-  
++
+   SentenceTranslation::SentenceTranslation(TableTranslator* translator,
+                                            an<Sentence>&& sentence,
+                                            DictEntryCollector&& collector,
+@@ -469,7 +470,7 @@ namespace rime {
+     PrepareSentence();
+     CheckEmpty();
+   }
+-  
++
+   bool SentenceTranslation::Next() {
+     if (sentence_) {
+       sentence_.reset();
+@@ -490,7 +491,7 @@ namespace rime {
+     }
+     return !CheckEmpty();
+   }
+-  
++
+   an<Candidate> SentenceTranslation::Peek() {
+     if (exhausted())
+       return nullptr;
+@@ -523,14 +524,14 @@ namespace rime {
+     }
+     return result;
+   }
+-  
++
+   void SentenceTranslation::PrepareSentence() {
+     if (!sentence_)
+       return;
+     sentence_->Offset(start_);
+     sentence_->set_comment(kUnitySymbol);
+     sentence_->set_syllabifier(New<SentenceSyllabifier>());
+-    
++
+     if (!translator_)
+       return;
+     string preedit = input_;
+@@ -547,14 +548,14 @@ namespace rime {
+     translator_->preedit_formatter().Apply(&preedit);
+     sentence_->set_preedit(preedit);
+   }
+-  
++
+   bool SentenceTranslation::CheckEmpty() {
+     set_exhausted(!sentence_ &&
+                   collector_.empty() &&
+                   user_phrase_collector_.empty());
+     return exhausted();
+   }
+-  
++
+   bool SentenceTranslation::PreferUserPhrase() const {
+     // compare code length
+     int user_phrase_code_length = 0;
+@@ -571,7 +572,7 @@ namespace rime {
+     }
+     return false;
+   }
+-  
++
+   inline static size_t consume_trailing_delimiters(size_t pos,
+                                                    const string& input,
+                                                    const string& delimiters) {
+@@ -581,7 +582,7 @@ namespace rime {
+     }
+     return pos;
+   }
+-  
++
+   template <class Iter>
+   inline static void collect_entries(DictEntryList& dest,
+                                      Iter& iter,
+@@ -594,7 +595,7 @@ namespace rime {
+       }
+     }
+   }
+-  
++
+   an<Translation>
+   TableTranslator::MakeSentence(const string& input, size_t start,
+                                 bool include_prefix_phrases) {
+@@ -743,5 +744,5 @@ namespace rime {
+     }
+     return nullptr;
+   }
+-  
++
+ }  // namespace rime
+-- 
+2.32.0
+
diff --git a/0001-fix-opencc-1.1.0-failed.patch b/0001-fix-opencc-1.1.0-failed.patch
deleted file mode 100644
index e734d67be452..000000000000
--- a/0001-fix-opencc-1.1.0-failed.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From e75a07ed0b70aa83617fd399820b4d615dde6639 Mon Sep 17 00:00:00 2001
-From: noodlefighter <noodlefighter@gmail.com>
-Date: Mon, 19 Apr 2021 16:56:41 +0800
-Subject: [PATCH] fix opencc 1.1.0 failed
-
----
- src/rime/gear/simplifier.cc | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/rime/gear/simplifier.cc b/src/rime/gear/simplifier.cc
-index 98a1c5a..171c415 100644
---- a/src/rime/gear/simplifier.cc
-+++ b/src/rime/gear/simplifier.cc
-@@ -54,7 +54,7 @@ class Opencc {
-       return false;
-     } else {
-       const opencc::DictEntry* entry = item.Get();
--      for (const char* value : entry->Values()) {
-+      for (auto value : entry->Values()) {
-         forms->push_back(value);
-       }
-       return forms->size() > 0;
--- 
-2.31.0
-
diff --git a/PKGBUILD b/PKGBUILD
index f478feaf058d..35df9921f694 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=librime
 pkgname=$_pkgname-sbxlm-git
-pkgver=1.5.2.sbxlm.6a8d183
+pkgver=1.4.0.r275.g6a8d183
 _librimecommit=6a8d183dd1345a96f66bc74f0bc222e1b342cfc0
 _octagramcommit=f92e083052b9983ee3cbddcda5ed60bb3c068e24
 _luacommit=d45a41af2f9d731e3c1516a191cc3160e3cb8377
@@ -20,7 +20,7 @@ depends=('boost-libs' 'capnproto' 'opencc' 'yaml-cpp' 'leveldb' 'librime-data' '
 makedepends=('cmake' 'boost' 'git' 'gtest' 'ninja')
 provides=("$_pkgname")
 conflicts=("$_pkgname")
-source=("0001-fix-opencc-1.1.0-failed.patch"
+source=("0001-fix-build.patch"
         "git://github.com/sbxlmdsl/librime.git#commit=${_librimecommit}"
         "https://github.com/lotem/librime-octagram/archive/$_octagramcommit/librime-octagram-$_octagramcommit.tar.gz"
         "https://github.com/hchunhui/librime-lua/archive/$_luacommit/librime-lua-$_luacommit.tar.gz")
@@ -31,7 +31,7 @@ sha512sums=('SKIP'
 
 prepare() {
   cd $_pkgname
-  patch -p1 < ../0001-fix-opencc-1.1.0-failed.patch
+  patch -p1 < ../0001-fix-build.patch
   cd plugins
   ln -sf "$srcdir"/librime-octagram-$_octagramcommit librime-octagram
   ln -sf "$srcdir"/librime-lua-$_luacommit librime-lua