Skip to content

Commit 1b8e67e

Browse files
chore(deps): update fcitx5-skk digest to 98e5550 !windows (#250)
Co-authored-by: Qijia Liu <liumeo@pku.edu.cn>
1 parent 7788af0 commit 1b8e67e

File tree

5 files changed

+5
-25
lines changed

5 files changed

+5
-25
lines changed

.github/workflows/js.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ jobs:
6262
git apply --directory=fcitx5-kkc patches/kkc.patch
6363
git apply --directory=fcitx5-rime patches/rime.log.patch
6464
git apply --directory=fcitx5-rime patches/rime.js.patch
65-
git apply --directory=fcitx5-skk patches/skk.patch
6665
git apply --directory=fcitx5-zhuyin patches/zhuyin.patch
6766
emcmake cmake -B build/js -G Ninja -DCMAKE_BUILD_TYPE=Release
6867
cmake --build build/js

.github/workflows/macos.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ jobs:
6969
git apply --directory=fcitx5-jyutping patches/jyutping.patch
7070
git apply --directory=fcitx5-kkc patches/kkc.patch
7171
git apply --directory=fcitx5-rime patches/rime.log.patch
72-
git apply --directory=fcitx5-skk patches/skk.patch
7372
git apply --directory=fcitx5-table-other patches/table-other.patch
7473
git apply --directory=fcitx5-zhuyin patches/zhuyin.patch
7574
cmake -B build/macos-${{ matrix.arch }} -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}

CMakeLists.txt

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ if (APPLE)
5353
"${FIND_ROOT_PATH}"
5454
)
5555
set(CMAKE_INSTALL_RPATH "${APP_CONTENTS_PATH}/lib") # scel2org5, libime_*
56-
set(SKK_PATH "$XDG_DATA_DIRS/skk/" CACHE STRING "") # skk
56+
set(SKK_PATH "$XDG_DATA_DIRS/skk" CACHE STRING "") # skk
5757
set(SKK_DEFAULT_PATH "$XDG_DATA_DIRS/skk/" CACHE STRING "") # kkc
5858
elseif (WIN32)
5959
list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/relative")
@@ -237,6 +237,9 @@ endif()
237237

238238
# skk
239239
if (SKK)
240+
if (APPLE)
241+
set(SKK_DEFAULT_PATH "") # clear old variable as set by kkc
242+
endif()
240243
add_subdirectory(fcitx5-skk)
241244
target_include_directories(skk PRIVATE "${PREBUILDER_INCLUDE_DIR}/gee-0.8")
242245
set(SKK_LINK_LIBS "-L${PREBUILDER_LIB_DIR}" -lgee-0.8 -lgio-2.0 -lgmodule-2.0 -ljson-glib-1.0 -lz)

patches/skk.patch

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)