update marisa-trie and librime

Author: rocka

.gitmodules

@@ -27,7 +27,7 @@
 	fetchRecurseSubmodules = false
 [submodule "marisa-trie"]
 	path = marisa-trie
-	url = https://github.com/rime/marisa-trie
+	url = https://github.com/s-yata/marisa-trie
 [submodule "librime"]
 	path = librime
 	url = https://github.com/rime/librime

librime

@@ -1,14 +1,5 @@
-From 15a8b479e66ac597a0fca4bede8012f5bb9df151 Mon Sep 17 00:00:00 2001
-From: Rocka <i@rocka.me>
-Date: Tue, 12 Nov 2024 22:16:16 +0800
-Subject: [PATCH 1/2] set file-prefix-map to relative path
-
----
- src/CMakeLists.txt | 2 ++
- 1 file changed, 2 insertions(+)
-
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 16082869..c4a5b5ca 100644
+index 8faa61f8..671622ce 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -166,6 +166,8 @@ if(BUILD_SHARED_LIBS)
@@ -20,24 +11,8 @@ index 16082869..c4a5b5ca 100644
    set_target_properties(rime-static PROPERTIES
      OUTPUT_NAME "rime" PREFIX "lib"
      ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
--- 
-2.47.0
-
-
-From 25608d1ea7a246b3ac4e7ccc02b1b6dfbb468869 Mon Sep 17 00:00:00 2001
-From: Rocka <i@rocka.me>
-Date: Tue, 12 Nov 2024 22:20:33 +0800
-Subject: [PATCH 2/2] Persist options to user.yaml in RimeSetOption
-
----
- src/rime/engine.cc  | 1 -
- src/rime/engine.h   | 2 ++
- src/rime/service.h  | 8 ++++----
- src/rime_api_impl.h | 9 +++++++++
- 4 files changed, 15 insertions(+), 5 deletions(-)
-
 diff --git a/src/rime/engine.cc b/src/rime/engine.cc
-index 07aa6b7d..7360e0b5 100644
+index 4a54f64c..2efe0c93 100644
 --- a/src/rime/engine.cc
 +++ b/src/rime/engine.cc
 @@ -52,7 +52,6 @@ class ConcreteEngine : public Engine {
@@ -49,7 +24,7 @@ index 07aa6b7d..7360e0b5 100644
 
  // implementations
 diff --git a/src/rime/engine.h b/src/rime/engine.h
-index 2e1c8b81..94a6b500 100644
+index 6b51a68e..c5b8f7e4 100644
 --- a/src/rime/engine.h
 +++ b/src/rime/engine.h
 @@ -16,6 +16,7 @@ namespace rime {
@@ -68,8 +43,30 @@ index 2e1c8b81..94a6b500 100644
 
   protected:
    Engine();
+diff --git a/src/rime/lever/deployment_tasks.cc b/src/rime/lever/deployment_tasks.cc
+index 6e6ff895..fe111d55 100644
+--- a/src/rime/lever/deployment_tasks.cc
++++ b/src/rime/lever/deployment_tasks.cc
+@@ -429,17 +429,6 @@ static bool ConfigNeedsUpdate(Config* config) {
+ }
+ 
+ bool ConfigFileUpdate::Run(Deployer* deployer) {
+-  const path shared_data_path(deployer->shared_data_dir);
+-  const path user_data_path(deployer->user_data_dir);
+-  // trash deprecated user copy created by an older version of Rime
+-  path source_config_path(shared_data_path / file_name_);
+-  path dest_config_path(user_data_path / file_name_);
+-  path trash = user_data_path / "trash";
+-  if (TrashDeprecatedUserCopy(source_config_path, dest_config_path,
+-                              version_key_, trash)) {
+-    LOG(WARNING) << "deprecated user copy of '" << file_name_
+-                 << "' is moved to " << trash;
+-  }
+   // build the config file if needs update
+   the<Config> config(Config::Require("config")->Create(file_name_));
+   if (ConfigNeedsUpdate(config.get())) {
 diff --git a/src/rime/service.h b/src/rime/service.h
-index 2b3111af..95ca87dc 100644
+index a69ae741..9b3d4b16 100644
 --- a/src/rime/service.h
 +++ b/src/rime/service.h
 @@ -44,11 +44,11 @@ class Session {
@@ -89,7 +86,7 @@ index 2b3111af..95ca87dc 100644
    string commit_text_;
  };
 diff --git a/src/rime_api_impl.h b/src/rime_api_impl.h
-index 7749ce98..b0200a67 100644
+index 30f4514f..c17d4794 100644
 --- a/src/rime_api_impl.h
 +++ b/src/rime_api_impl.h
 @@ -17,6 +17,8 @@
@@ -101,7 +98,7 @@ index 7749ce98..b0200a67 100644
 
  using namespace rime;
 
-@@ -426,6 +428,13 @@ RIME_DEPRECATED void RimeSetOption(RimeSessionId session_id,
+@@ -430,6 +432,13 @@ RIME_DEPRECATED void RimeSetOption(RimeSessionId session_id,
    if (!ctx)
      return;
    ctx->set_option(option, !!value);
@@ -115,6 +112,3 @@ index 7749ce98..b0200a67 100644
  }
 
  RIME_DEPRECATED Bool RimeGetOption(RimeSessionId session_id,
--- 
-2.47.0
-

librime-lua

@@ -1,12 +1,12 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d89d928..6ba6a32 100644
+index b96374e..4f040d5 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -49,6 +49,7 @@ add_library(marisa
-     ${MARISA_SRC}
+@@ -195,6 +195,7 @@ target_include_directories(marisa
+   PRIVATE
+     lib
  )
- 
 +target_compile_options(marisa PRIVATE "-ffile-prefix-map=${CMAKE_CURRENT_SOURCE_DIR}=.")
- install(TARGETS marisa
-         EXPORT marisa-targets
-         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+ set_target_properties(marisa PROPERTIES
+   VERSION "${Marisa_VERSION}"
+   SOVERSION "${Marisa_VERSION_MAJOR}"

marisa-trie

@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c2e9dc70..70085eac 100644
+index c2e9dc70..fb9077d0 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -79,10 +79,6 @@ endif()
@@ -13,17 +13,20 @@ index c2e9dc70..70085eac 100644
 
  set (DIR_PREFIX ${CMAKE_INSTALL_PREFIX})
  set (DIR_INCLUDE ${DIR_PREFIX}/include)
-@@ -215,7 +211,8 @@ if(NOT USE_SYSTEM_MARISA)
+@@ -215,19 +211,13 @@ if(NOT USE_SYSTEM_MARISA)
    message(STATUS "Use bundled marisa library.")
    add_subdirectory(deps/marisa-0.2.6)
  else()
 -  find_library(LIBMARISA NAMES marisa)
-+  find_package(marisa)
-+  set(LIBMARISA marisa)
-   if (LIBMARISA)
-     message(STATUS "libmarisa found: ${LIBMARISA}")
-   else()
-@@ -227,7 +224,6 @@ endif()
+-  if (LIBMARISA)
+-    message(STATUS "libmarisa found: ${LIBMARISA}")
+-  else()
+-    message(FATAL_ERROR "libmarisa not found.")
+-  endif()
++  find_package(Marisa REQUIRED)
+ endif()
+ 
+ ######## Subdirectories
 
  add_subdirectory(src)
  add_subdirectory(doc)
@@ -32,9 +35,18 @@ index c2e9dc70..70085eac 100644
 
  ######## Testing
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 227e6c65..223553c1 100644
+index 227e6c65..9aed48d1 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
+@@ -116,7 +116,7 @@ add_library(libopencc ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS})
+ add_library(OpenCC::OpenCC ALIAS libopencc)
+ set_target_properties(libopencc PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ source_group(libopencc FILES ${LIBOPENCC_SOURCES} ${LIBOPENCC_HEADERS})
+-target_link_libraries(libopencc marisa)
++target_link_libraries(libopencc Marisa::marisa)
+ target_include_directories(libopencc PUBLIC
+     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+     $<INSTALL_INTERFACE:${DIR_INCLUDE}/opencc>
 @@ -206,4 +206,3 @@ endif()
 
  # Subdir

patches/librime.patch

@@ -74,7 +74,10 @@ boostRule = do
               ],
           -- symlink headers for each abi to reduce size
           postBuildEachABI = BuildActionABI $ \_ env ->
-            liftIO $ createDirectoryLink (".." </> "include") (buildEnvOutPrefix env </> "include")
+            liftIO $ do
+              let includePath = buildEnvOutPrefix env </> "include"
+              whenM (doesPathExist includePath) $ removePathForcibly includePath
+              createDirectoryLink (".." </> "include") includePath
         }
   "boost" ~> do
     buildWithAndroidEnv buildBoost Boost

patches/marisa-tire.patch

@@ -63,7 +63,7 @@ openccRule = do
               "-DENABLE_BENCHMARK=OFF",
               "-DENABLE_DARTS=OFF",
               "-DUSE_SYSTEM_MARISA=ON",
-              "-Dmarisa_DIR=" <> (buildEnvOut </> "marisa" </> buildEnvABI </> "lib" </> "cmake" </> "marisa"),
+              "-DMarisa_DIR=" <> (buildEnvOut </> "marisa" </> buildEnvABI </> "lib" </> "cmake" </> "Marisa"),
               "-DUSE_SYSTEM_PYBIND11=OFF",
               "-DUSE_SYSTEM_RAPIDJSON=OFF",
               "-DUSE_SYSTEM_TCLAP=OFF"