From 7f28b20b03739a520b8304eab827ddb0ce628950 Mon Sep 17 00:00:00 2001 From: Qijia Liu Date: Sat, 6 Jan 2024 22:25:00 -0500 Subject: [PATCH] rime: fix lua and opencc --- README.md | 1 + patches/rime.patch | 7 ++++--- scripts/rime.sh | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9de5112..1affc4b 100644 --- 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 index f5c9554..bbc0794 100644 --- 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 $ "-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 index 04167a4..b3009a6 100755 --- 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