From 1bdf0be186c523c10bc575301dace8928b179985 Mon Sep 17 00:00:00 2001
From: Qijia Liu <liumeo@pku.edu.cn>
Date: Fri, 23 Jun 2023 19:55:40 -0400
Subject: [PATCH] update librime and drop patch

---
 librime                 |  2 +-
 librime_patch           | 47 -----------------------------------------
 scripts/build_native.sh |  2 ++
 3 files changed, 3 insertions(+), 48 deletions(-)

diff --git a/librime b/librime
index 1c43fe5..bd3c7c7 160000
--- a/librime
+++ b/librime
@@ -1 +1 @@
-Subproject commit 1c43fe5f835c172dcb1d5646c0a46c8b33173006
+Subproject commit bd3c7c712ce0d3a29030666a007615b117e5e4d8
diff --git a/librime_patch b/librime_patch
index af3822c..4b7d729 100644
--- a/librime_patch
+++ b/librime_patch
@@ -56,53 +56,6 @@ index 577bb31..22b9d40 100644
    if (!config_->GetString("schema/name", &schema_name_)) {
      schema_name_ = schema_id_;
    }
-diff --git a/src/rime_api.cc b/src/rime_api.cc
-index 10c99f5..506396e 100644
---- a/src/rime_api.cc
-+++ b/src/rime_api.cc
-@@ -971,11 +971,11 @@ static bool do_with_candidate_on_current_page(
- }
- 
- 
--Bool RimeSelectCandidate(RimeSessionId session_id, size_t index) {
-+RIME_API Bool RimeSelectCandidate(RimeSessionId session_id, size_t index) {
-   return do_with_candidate(session_id, index, &Context::Select);
- }
- 
--Bool RimeSelectCandidateOnCurrentPage(RimeSessionId session_id, size_t index) {
-+RIME_API Bool RimeSelectCandidateOnCurrentPage(RimeSessionId session_id, size_t index) {
-   return do_with_candidate_on_current_page(session_id, index, &Context::Select);
- }
- 
-@@ -983,11 +983,11 @@ const char* RimeGetVersion() {
-   return RIME_VERSION;
- }
- 
--Bool RimeDeleteCandidate(RimeSessionId session_id, size_t index) {
-+RIME_API Bool RimeDeleteCandidate(RimeSessionId session_id, size_t index) {
-   return do_with_candidate(session_id, index, &Context::DeleteCandidate);
- }
- 
--Bool RimeDeleteCandidateOnCurrentPage(RimeSessionId session_id, size_t index) {
-+RIME_API Bool RimeDeleteCandidateOnCurrentPage(RimeSessionId session_id, size_t index) {
-   return do_with_candidate_on_current_page(
-       session_id, index, &Context::DeleteCandidate);
- }
-diff --git a/src/rime_api.h b/src/rime_api.h
-index 671a1c1..d0bc966 100644
---- a/src/rime_api.h
-+++ b/src/rime_api.h
-@@ -287,6 +287,10 @@ RIME_API void RimeCandidateListEnd(RimeCandidateListIterator* iterator);
- RIME_API Bool RimeCandidateListFromIndex(RimeSessionId session_id,
-                                          RimeCandidateListIterator* iterator,
-                                          int index);
-+RIME_API Bool RimeSelectCandidate(RimeSessionId session_id, size_t index);
-+RIME_API Bool RimeSelectCandidateOnCurrentPage(RimeSessionId session_id, size_t index);
-+RIME_API Bool RimeDeleteCandidate(RimeSessionId session_id, size_t index);
-+RIME_API Bool RimeDeleteCandidateOnCurrentPage(RimeSessionId session_id, size_t index);
- 
- // Runtime options
- 
 diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt
 index 18e3407..b79a0c1 100644
 --- a/tools/CMakeLists.txt
diff --git a/scripts/build_native.sh b/scripts/build_native.sh
index 00285ed..71bb6de 100644
--- a/scripts/build_native.sh
+++ b/scripts/build_native.sh
@@ -3,6 +3,7 @@ set -e
 root=$PWD
 
 opencc_blddir=build/opencc_native
+rm -rf $opencc_blddir
 cmake librime/deps/opencc -B $opencc_blddir -G Ninja \
   -DCMAKE_INSTALL_PREFIX:PATH=/usr/local \
   -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
@@ -18,6 +19,7 @@ popd
 rm -rf librime/plugins/lua
 
 librime_blddir=build/librime_native
+rm -rf $librime_blddir
 cmake librime -B $librime_blddir -G Ninja \
   -DBUILD_TEST:BOOL=OFF \
   -DENABLE_LOGGING:BOOL=OFF \