Merge remote-tracking branch 'origin/master' into fcitx

fcitx · Sep 30, 2024 · 961fec8 · 961fec8
2 parents 073208a + 3a9a56e
commit 961fec8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/android/jni/make_archive.py b/src/android/jni/make_archive.py
@@ -61,7 +61,7 @@ def main():
       dest_dir.mkdir(parents=True, exist_ok=True)
       shutil.copy(src, dest_dir.joinpath('libmozc.so'))
     shutil.make_archive(
-        str(output.with_suffix('.zip')), format='zip', root_dir=tmp_dir
+        str(output.with_suffix('')), format='zip', root_dir=tmp_dir
     )
 
 

diff --git a/src/engine/minimal_engine.cc b/src/engine/minimal_engine.cc
@@ -167,7 +167,7 @@ class MinimalConverter : public ConverterInterface {
 
   bool DeleteCandidateFromHistory(const Segments &segments,
                                   size_t segment_index,
-                                  int candidate_index) const {
+                                  int candidate_index) const override {
     return true;
   }