fcitx-qt5: kde5PackagesFun -> qt5LibsFun #15584
Merged
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.
Things done
(nix.useSandbox on NixOS,
or option
build-use-sandbox
innix.conf
on non-NixOS)
nix-shell -p nox --run "nox-review wip"
./result/bin/
)This PR goal is to remove
extra-cmake-modules
dependency fromfcitx-qt5
so it can be moved fromkde5PackagesFun
toqt5LibsFun
and be used with any versions of Qt5.This address #15569 and should be tested and merged with #15498 fix.fcitx-qt5
was only using a fewextra-cmake-modules
functions, so I chose the simple approach to patch the source to bring the needed modules.Any improvement/feedback is welcomed.
I have tested this with in fcitx-wrapper:-qt5.fcitx-qt5
-> kate (qt56) is working, qutebrowser (qt55) is not-qt55.fcitx-qt5
-> kate (qt56) is not working, qutebrowser (qt55) isUpdate (2016-05-21):
I changed the commit to use the modules from
kde5.extra-cmake-modules
directly by linking them infcitx-qt5
source, that way can use the few required extra cmake modules without havingfcitx-qt5
be part ofkde5PackagesFun
, and this make the patch much lighter.By using
qt55.fcitx-qt5
infcitx-wrapper
, fcitx is working fine in Qt 5.5 and Qt 5.6 applications (tested with kate and qutebrowser).I don't know the reason, but suppose that this is due to the plugin ABI being compatible between these 2 versions.
So this PR will improve the situation as soon as it gets merged, and because it moves
fcitx-qt5
toqt5LibsFun
, should helpfcitx-qt5
to be integrated in #15498 fix.cc @ttuegel