Update libraries

build.cfg

@@ -27,8 +27,8 @@ py_table = py_table-20121124.tar.gz
 py_table_sha256 = 42146ac97de6c13d55f9e99ed873915f4c66739e9c11532a34556badf9792c04
 
 # boost
-boost_version = 1.83.0
-boost_sha256 = c5a0688e1f0c05f354bbd0b32244d36085d9ffc9f932e8a18983a9908096f614
+boost_version = 1.86.0
+boost_sha256 = 2c5ec5edcdff47ff55e27ed9560b0a0b94b07bd07ed9928b476150e16b0efc57
 
 # jyutping dict
 jyutping_dict = jyutping-dict-20180104.tar.xz

patches/glog.patch

@@ -10,27 +10,3 @@ index b787631..1fc8cf4 100644
  add_library (glog
    $<TARGET_OBJECTS:glog_internal>
    ${_glog_EMPTY_SOURCE}
-diff --git a/src/glog/platform.h b/src/glog/platform.h
-index 4aaf5b0..f118ca8 100644
---- a/src/glog/platform.h
-+++ b/src/glog/platform.h
-@@ -42,6 +42,9 @@
- #  ifndef GLOG_OS_LINUX
- #    define GLOG_OS_LINUX
- #  endif
-+#  if defined(__ANDROID__)
-+#    define GLOG_OS_ANDROID
-+#  endif
- #elif defined(macintosh) || defined(__APPLE__) || defined(__APPLE_CC__)
- #  define GLOG_OS_MACOSX
- #elif defined(__FreeBSD__)
-@@ -52,9 +55,6 @@
- #  define GLOG_OS_OPENBSD
- #elif defined(__EMSCRIPTEN__)
- #  define GLOG_OS_EMSCRIPTEN
--#elif defined(__ANDROID__)
--#  define GLOG_OS_ANDROID
--#else
- // TODO(hamaji): Add other platforms.
- #error Platform not supported by glog. Please consider to contribute platform information by submitting a pull request on Github.
- #endif

patches/librime-lua.patch

@@ -1,21 +1,46 @@
-From 35d353519e34a0af14bdf8b3e504b16285371093 Mon Sep 17 00:00:00 2001
+From 1a7a8972bb06060bf61c44e06fda3d3bf928abf5 Mon Sep 17 00:00:00 2001
 From: Rocka <i@rocka.me>
-Date: Wed, 24 Jan 2024 19:39:09 +0800
-Subject: [PATCH 1/2] find lua with find_package
+Date: Tue, 12 Nov 2024 22:47:19 +0800
+Subject: [PATCH 1/2] set file-prefix-map to relative path
+
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 42f2ebb..4f068d0 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,6 +40,7 @@ aux_source_directory(src RIME_LUA_SRC)
+ aux_source_directory(src/lib RIME_LUA_LIB_SRC)
+
+ add_library(rime-lua-objs OBJECT ${RIME_LUA_SRC} ${RIME_LUA_LIB_SRC} ${LUA_SRC})
++target_compile_options(rime-lua-objs PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
+ if(BUILD_SHARED_LIBS)
+   set_target_properties(rime-lua-objs PROPERTIES POSITION_INDEPENDENT_CODE ON)
+ endif()
+-- 
+2.47.0
+
+From 2a3f9504f25320b598022ded2f8e97522390a507 Mon Sep 17 00:00:00 2001
+From: Rocka <i@rocka.me>
+Date: Tue, 12 Nov 2024 22:47:28 +0800
+Subject: [PATCH 2/2] find lua with find_package
 
 ---
  CMakeLists.txt | 18 +++---------------
  1 file changed, 3 insertions(+), 15 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 356731e..0d5d1be 100644
+index 4f068d0..187b24a 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -1,19 +1,7 @@
+@@ -1,20 +1,8 @@
+ set(LUA_VERSION "lua" CACHE STRING "lua version")
  if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/lua5.4/lua.h")
 -  find_package(PkgConfig)
 -  if(PkgConfig_FOUND)
--    foreach(pkg lua lua54 lua53 lua52 luajit lua51)
+-    foreach(pkg ${LUA_VERSION} lua54 lua53 lua52 luajit lua51)
 -      pkg_check_modules(LUA IMPORTED_TARGET GLOBAL ${pkg})
 -      if(LUA_FOUND)
 -	break()
@@ -35,30 +60,5 @@ index 356731e..0d5d1be 100644
    message(STATUS "Using in-tree lua source")
    include_directories(thirdparty/lua5.4)
 -- 
-2.43.0
-
-
-From 7207ea10cb6fd945374432c0b8c0a608514cb34d Mon Sep 17 00:00:00 2001
-From: Rocka <i@rocka.me>
-Date: Wed, 24 Jan 2024 19:39:22 +0800
-Subject: [PATCH 2/2] set file-prefix-map to relative path
-
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0d5d1be..9cdb241 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -27,6 +27,7 @@ aux_source_directory(src RIME_LUA_SRC)
- aux_source_directory(src/lib RIME_LUA_LIB_SRC)
-
- add_library(rime-lua-objs OBJECT ${RIME_LUA_SRC} ${RIME_LUA_LIB_SRC} ${LUA_SRC})
-+target_compile_options(rime-lua-objs PRIVATE "-ffile-prefix-map=${CMAKE_SOURCE_DIR}=.")
- if(BUILD_SHARED_LIBS)
-   set_target_properties(rime-lua-objs PROPERTIES POSITION_INDEPENDENT_CODE ON)
- endif()
--- 
-2.43.0
+2.47.0
 

patches/librime-octagram.patch

@@ -1,35 +1,3 @@
-From 8780e27f0fe35fd637a883ea0ab8ceda1bb42580 Mon Sep 17 00:00:00 2001
-From: Rocka <i@rocka.me>
-Date: Tue, 2 Jan 2024 22:21:41 +0800
-Subject: [PATCH 1/2] disable building command line tools
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7f9c34e..4115fa7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -15,4 +15,4 @@ set(plugin_objs $<TARGET_OBJECTS:rime-octagram-objs> PARENT_SCOPE)
- set(plugin_deps ${rime_library} PARENT_SCOPE)
- set(plugin_modules "octagram" PARENT_SCOPE)
-
--add_subdirectory(tools)
-+# add_subdirectory(tools)
--- 
-2.43.0
-
-
-From f2013e501dd0653c09b9456b2287aed7ef0e91ee Mon Sep 17 00:00:00 2001
-From: Rocka <i@rocka.me>
-Date: Tue, 2 Jan 2024 22:21:47 +0800
-Subject: [PATCH 2/2] set file-prefix-map to relative path
-
----
- CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 4115fa7..162ffb5 100644
 --- a/CMakeLists.txt
@@ -42,6 +10,3 @@ index 4115fa7..162ffb5 100644
  if(BUILD_SHARED_LIBS)
    set_target_properties(rime-octagram-objs
      PROPERTIES
--- 
-2.43.0
-

patches/librime-predict.patch

@@ -10,9 +10,3 @@ index 07703bf..5ab6d3b 100644
  if(BUILD_SHARED_LIBS)
    set_target_properties(rime-predict-objs
      PROPERTIES
-@@ -15,4 +16,4 @@ set(plugin_objs $<TARGET_OBJECTS:rime-predict-objs> PARENT_SCOPE)
- set(plugin_deps ${rime_library} PARENT_SCOPE)
- set(plugin_modules "predict" PARENT_SCOPE)
-
--add_subdirectory(tools)
-+# add_subdirectory(tools)

patches/librime.patch

@@ -1,17 +1,17 @@
-From 8fd82c000e277d30c087b6dd29b5a76a8b55db25 Mon Sep 17 00:00:00 2001
+From 15a8b479e66ac597a0fca4bede8012f5bb9df151 Mon Sep 17 00:00:00 2001
 From: Rocka <i@rocka.me>
-Date: Tue, 2 Jan 2024 22:19:25 +0800
-Subject: [PATCH] set file-prefix-map to relative path
+Date: Tue, 12 Nov 2024 22:16:16 +0800
+Subject: [PATCH 1/2] set file-prefix-map to relative path
 
 ---
- src/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
+ src/CMakeLists.txt | 2 ++
+ 1 file changed, 2 insertions(+)
 
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 6364e1c8..347107f0 100644
+index 16082869..c4a5b5ca 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -162,6 +162,8 @@ if(BUILD_SHARED_LIBS)
+@@ -166,6 +166,8 @@ if(BUILD_SHARED_LIBS)
  else()
    add_library(rime-static STATIC ${rime_src})
    target_link_libraries(rime-static ${rime_deps})
@@ -21,23 +21,23 @@ index 6364e1c8..347107f0 100644
      OUTPUT_NAME "rime" PREFIX "lib"
      ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}/lib)
 -- 
-2.43.0
+2.47.0
 
 
-From 7b5c910557dcc45f4abc7b6a8d65da4ac3bff920 Mon Sep 17 00:00:00 2001
+From 25608d1ea7a246b3ac4e7ccc02b1b6dfbb468869 Mon Sep 17 00:00:00 2001
 From: Rocka <i@rocka.me>
-Date: Wed, 24 Jan 2024 19:21:20 +0800
+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.cc    | 9 +++++++++
+ 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 64c0fb68..549a8112 100644
+index 07aa6b7d..7360e0b5 100644
 --- a/src/rime/engine.cc
 +++ b/src/rime/engine.cc
 @@ -52,7 +52,6 @@ class ConcreteEngine : public Engine {
@@ -49,7 +49,7 @@ index 64c0fb68..549a8112 100644
 
  // implementations
 diff --git a/src/rime/engine.h b/src/rime/engine.h
-index 2e1c8b81..47c39544 100644
+index 2e1c8b81..94a6b500 100644
 --- a/src/rime/engine.h
 +++ b/src/rime/engine.h
 @@ -16,6 +16,7 @@ namespace rime {
@@ -88,20 +88,20 @@ index 2b3111af..95ca87dc 100644
    time_t last_active_time_ = 0;
    string commit_text_;
  };
-diff --git a/src/rime_api.cc b/src/rime_api.cc
-index 678169c0..1085fe5c 100644
---- a/src/rime_api.cc
-+++ b/src/rime_api.cc
-@@ -21,6 +21,8 @@
+diff --git a/src/rime_api_impl.h b/src/rime_api_impl.h
+index 7749ce98..b0200a67 100644
+--- a/src/rime_api_impl.h
++++ b/src/rime_api_impl.h
+@@ -15,6 +15,8 @@
+ #include <rime/setup.h>
  #include <rime/signature.h>
  #include <rime/switches.h>
- #include <rime_api.h>
 +#include <rime/engine.h>
 +#include <rime/switcher.h>
 
- using namespace rime;
- using namespace std::placeholders;
-@@ -441,6 +443,13 @@ RIME_API void RimeSetOption(RimeSessionId session_id,
+ #include "rime_api.h"
+
+@@ -426,6 +428,13 @@ RIME_DEPRECATED void RimeSetOption(RimeSessionId session_id,
    if (!ctx)
      return;
    ctx->set_option(option, !!value);
@@ -114,7 +114,7 @@ index 678169c0..1085fe5c 100644
 +  }
  }
 
- RIME_API Bool RimeGetOption(RimeSessionId session_id, const char* option) {
+ RIME_DEPRECATED Bool RimeGetOption(RimeSessionId session_id,
 -- 
-2.43.0
+2.47.0