Skip to content

chore(deps): update fcitx5-skk digest to 98e5550 !windows #250

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eagleoflqj merged 2 commits into from
Dec 22, 2025
Merged

chore(deps): update fcitx5-skk digest to 98e5550 !windows #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf16db2
chore(deps): update fcitx5-skk digest to 98e5550
renovate[bot] Dec 22, 2025
a6f7865
remove patch and adjust cmake
eagleoflqj Dec 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/workflows/js.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@ jobs:
git apply --directory=fcitx5-kkc patches/kkc.patch
git apply --directory=fcitx5-rime patches/rime.log.patch
git apply --directory=fcitx5-rime patches/rime.js.patch
git apply --directory=fcitx5-skk patches/skk.patch
git apply --directory=fcitx5-zhuyin patches/zhuyin.patch
emcmake cmake -B build/js -G Ninja -DCMAKE_BUILD_TYPE=Release
cmake --build build/js
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/macos.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ jobs:
git apply --directory=fcitx5-jyutping patches/jyutping.patch
git apply --directory=fcitx5-kkc patches/kkc.patch
git apply --directory=fcitx5-rime patches/rime.log.patch
git apply --directory=fcitx5-skk patches/skk.patch
git apply --directory=fcitx5-table-other patches/table-other.patch
git apply --directory=fcitx5-zhuyin patches/zhuyin.patch
cmake -B build/macos-${{ matrix.arch }} -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
Expand Down
5 changes: 4 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ if (APPLE)
"${FIND_ROOT_PATH}"
)
set(CMAKE_INSTALL_RPATH "${APP_CONTENTS_PATH}/lib") # scel2org5, libime_*
set(SKK_PATH "$XDG_DATA_DIRS/skk/" CACHE STRING "") # skk
set(SKK_PATH "$XDG_DATA_DIRS/skk" CACHE STRING "") # skk
set(SKK_DEFAULT_PATH "$XDG_DATA_DIRS/skk/" CACHE STRING "") # kkc
elseif (WIN32)
list(PREPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/relative")
Expand Down Expand Up @@ -237,6 +237,9 @@ endif()

# skk
if (SKK)
if (APPLE)
set(SKK_DEFAULT_PATH "") # clear old variable as set by kkc
endif()
add_subdirectory(fcitx5-skk)
target_include_directories(skk PRIVATE "${PREBUILDER_INCLUDE_DIR}/gee-0.8")
set(SKK_LINK_LIBS "-L${PREBUILDER_LIB_DIR}" -lgee-0.8 -lgio-2.0 -lgmodule-2.0 -ljson-glib-1.0 -lz)
Expand Down
2 changes: 1 addition & 1 deletion fcitx5-skk
Open in desktop
Submodule fcitx5-skk updated 8 files
+0 −1 .github/workflows/check.yml
+4 −1 CMakeLists.txt
+2 −2 README.md
+1 −1 config.h.in
+1 −1 gui/adddictdialog.cpp
+8 −5 gui/dictwidget.cpp
+1 −1 src/dictionary_list.in
+14 −14 src/skk.cpp
21 changes: 0 additions & 21 deletions patches/skk.patch
View file
Open in desktop

This file was deleted.

Loading