app-i18n/fcitx: switch to nlohmann_json, add system-yoga USE#11052
Open
Zakkaus wants to merge 3 commits into
Open
app-i18n/fcitx: switch to nlohmann_json, add system-yoga USE#11052Zakkaus wants to merge 3 commits into
Zakkaus wants to merge 3 commits into
Conversation
Contributor
|
CI出错了，你有时间看看怎么修复吗？ |
Upstream fcitx5 master migrated its build dependency from json-c to nlohmann_json and vendors yoga as the third_party/yoga submodule. Replace dev-libs/json-c with dev-cpp/nlohmann_json under the keyboard USE, and add a system-yoga USE flag (dev-libs/yoga, bundled submodule by default) wired to -DUSE_SYSTEM_YOGA. Fixes the fcitx-9999 configure failure. Closes: gentoo-zh#11042 Signed-off-by: Zakk <zakk@gentoozh.org>
fcitx5's spell module downloads en_dict-20121020.tar.gz during the build via a
cmake file(DOWNLOAD), which the network sandbox blocks (CI red). Add the pinned
tarball to SRC_URI and drop it into ${S}/src/modules/spell in src_prepare, the
same place upstream's *_dict release tarball ships it; cmake's EXISTS+SHA256
guard then skips the fetch. Build-tested on the amd64 box.
Zakkaus
force-pushed
the
qa-fcitx-nlohmann
branch
from
July 18, 2026 22:59
9940c8e to
bc82ef0
Compare
Member
Author
|
Zakkaus
marked this pull request as ready for review
July 18, 2026 23:03
fcitx5's top-level CMakeLists still requires only cmake 3.13, so ECM emits the CMake < 3.16 compatibility QA notice, which trips the elog gate. This is upstream's to bump and is not patchable on a live ebuild, so set CMAKE_QA_COMPAT_SKIP (same as media-libs/libsdl3 and games-arcade/supertux-9999).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
修复 #11042。fcitx-9999 两处:
json-c:=→dev-cpp/nlohmann_json(header-only、SLOT=0、无:=);加 system-yoga USE(默认关走自带子模块,开则用 dev-libs/yoga),-DUSE_SYSTEM_YOGA与上游一致。file(DOWNLOAD)抓en_dict-20121020.tar.gz,被 network-sandbox 挡。把这个 pinned 字典加进 SRC_URI、在 src_prepare 放进${S}/src/modules/spell/(和上游*_dictrelease tarball 同位置),cmake 的 EXISTS+SHA256 短路即跳过下载、拼写字典照常保留。这跟 ::gentoo release fcitx 同款机制;live ebuild 带 pinned SRC_URI distfile 也有约 20 个 in-tree 先例(glibc / libpinyin-9999 / svt-av1 等)。测试:build box 实测 emerge fcitx-9999 完整 build+install 通过。已 rebase 到最新 master。
Closes #11042
Please check all the boxes that apply:
pkgcheck scan --commits --netto check for issues with my commits.Please note that all boxes must be checked for the pull request to be merged.