rime: fix lua and opencc (#11)

fcitx-contrib · Jan 7, 2024 · b6b3f85 · b6b3f85
1 parent 35594e3
commit b6b3f85
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -22,5 +22,6 @@ Build plugins for [fcitx5-macos](https://github.com/fcitx-contrib/fcitx5-macos).
 
 ## Manual installation
 ```sh
+mkdir -p ~/Library/fcitx5
 tar -xjvC ~/Library/fcitx5 -f hallelujah-x86_64.tar.bz2
 ```
diff --git a/patches/rime.patch b/patches/rime.patch
@@ -1,13 +1,14 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6fdc402..51b1e75 100644
+index 6fdc402..3d05b15 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -16,7 +16,7 @@ find_package(PkgConfig REQUIRED)
+@@ -16,7 +16,8 @@ find_package(PkgConfig REQUIRED)
 
  if (NOT DEFINED RIME_TARGET)
      pkg_check_modules(Rime REQUIRED IMPORTED_TARGET "rime>=1.0.0")
 -    set(RIME_TARGET PkgConfig::Rime)
-+    set(RIME_TARGET PkgConfig::Rime "-L/tmp/fcitx5/lib" leveldb yaml-cpp marisa opencc glog)
++    add_definitions(-I "/tmp/fcitx5/include")
++    set(RIME_TARGET $<LINK_LIBRARY:WHOLE_ARCHIVE,"/tmp/fcitx5/lib/librime.a"> "-L/tmp/fcitx5/lib" leveldb yaml-cpp marisa opencc glog lua)
  endif()
 
  if ("${Rime_VERSION}" VERSION_LESS "1.7.0")

diff --git a/scripts/rime.sh b/scripts/rime.sh
@@ -27,5 +27,6 @@ cp rime-luna-pinyin/*.yaml $rime_dir
 cp rime-stroke/*.yaml $rime_dir
 cp default.yaml $rime_dir
 cd -
+cp -r $INSTALL_PREFIX/share/opencc $DESTDIR$rime_data_dir
 
 f5m_make_tarball