[PATCH 0/2] fcitx5-configtool: enable kcm and remove inputs label

  • Open
  • quality assurance status badge
Details
One participant
  • Zheng Junjie
Owner
unassigned
Submitted by
Zheng Junjie
Severity
normal
Z
Z
Zheng Junjie wrote on 28 Apr 08:45 +0200
(address . guix-patches@gnu.org)
cover.1714286584.git.zhengjunjie@iscas.ac.cn
Zheng Junjie (2):
gnu: fcitx5-configtool: Enable kcm support.
gnu: fcitx5-configtool: Remove inputs label.

gnu/packages/fcitx5.scm | 37 ++++++++++++++++++++++---------------
1 file changed, 22 insertions(+), 15 deletions(-)


base-commit: 4178eaf3b2eeea8f6c2e49b1d65cd60a1663c4a9
--
2.41.0
Z
Z
Zheng Junjie wrote on 28 Apr 08:52 +0200
[PATCH 1/2] gnu: fcitx5-configtool: Enable kcm support.
(address . 70623@debbugs.gnu.org)
2f305ea7199e12069d41d9094e62b2fddc4818ab.1714286584.git.zhengjunjie@iscas.ac.cn
* gnu/packages/fcitx5.scm (fcitx5-configtool)
[arguments]: Remove it.
[inputs]: Add qtdeclarative, qtquickcontrols2, ki18n, kpackage, kdeclarative,
kiconthemes, kcoreaddons, plasma-framework, kwindowsystem, kirigami, libxkbcommon.

Change-Id: I43a43458232a5ad3c1d156c779359e356cbf98b8
---
gnu/packages/fcitx5.scm | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 435ccde45f..6e2f922c37 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -439,17 +439,24 @@ (define-public fcitx5-configtool
(sha256
(base32 "1pnwrj6kgha91djfvd2439nbhrmjargpw8ashhb91y5h3cdz7vhz"))))
(build-system cmake-build-system)
- (arguments
- `(#:configure-flags
- ;; KDE is currently not working on Guix, KCM supports doesn't make sense.
- '("-DENABLE_KCM=Off")))
(inputs
`(("fcitx5" ,fcitx5)
("fcitx5-qt" ,fcitx5-qt)
("qtbase" ,qtbase-5)
("qtx11extras" ,qtx11extras)
+ ("qtdeclarative" ,qtdeclarative-5)
+ ("qtquickcontrols2" ,qtquickcontrols2-5)
+ ("ki18n" ,ki18n)
+ ("kpackage" ,kpackage)
+ ("kdeclarative" ,kdeclarative)
+ ("kiconthemes" ,kiconthemes)
+ ("kcoreaddons" ,kcoreaddons)
+ ("plasma-framework" ,plasma-framework)
("kitemviews" ,kitemviews)
("kwidgetsaddons" ,kwidgetsaddons)
+ ("kwindowsystem" ,kwindowsystem)
+ ("kirigami" ,kirigami)
+ ("libxkbcommon" ,libxkbcommon)
("libx11" ,libx11)
("xkeyboard-config" ,xkeyboard-config)
("libxkbfile" ,libxkbfile)
--
2.41.0
Z
Z
Zheng Junjie wrote on 28 Apr 08:52 +0200
[PATCH 2/2] gnu: fcitx5-configtool: Remove inputs label.
(address . 70623@debbugs.gnu.org)
7ede98be440f471b85683dfdf004c75409eeffc2.1714286584.git.zhengjunjie@iscas.ac.cn
* gnu/packages/fcitx5.scm (fcitx5-configtool)
[inputs]: Remove label.

Change-Id: Ib45fbf71d5f2ffbac3285e388629b6cf0ca004fe
---
gnu/packages/fcitx5.scm | 44 ++++++++++++++++++++---------------------
1 file changed, 22 insertions(+), 22 deletions(-)

Toggle diff (57 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 6e2f922c37..aba0be21e7 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -440,28 +440,28 @@ (define-public fcitx5-configtool
(base32 "1pnwrj6kgha91djfvd2439nbhrmjargpw8ashhb91y5h3cdz7vhz"))))
(build-system cmake-build-system)
(inputs
- `(("fcitx5" ,fcitx5)
- ("fcitx5-qt" ,fcitx5-qt)
- ("qtbase" ,qtbase-5)
- ("qtx11extras" ,qtx11extras)
- ("qtdeclarative" ,qtdeclarative-5)
- ("qtquickcontrols2" ,qtquickcontrols2-5)
- ("ki18n" ,ki18n)
- ("kpackage" ,kpackage)
- ("kdeclarative" ,kdeclarative)
- ("kiconthemes" ,kiconthemes)
- ("kcoreaddons" ,kcoreaddons)
- ("plasma-framework" ,plasma-framework)
- ("kitemviews" ,kitemviews)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("kwindowsystem" ,kwindowsystem)
- ("kirigami" ,kirigami)
- ("libxkbcommon" ,libxkbcommon)
- ("libx11" ,libx11)
- ("xkeyboard-config" ,xkeyboard-config)
- ("libxkbfile" ,libxkbfile)
- ("gettext" ,gettext-minimal)
- ("iso-codes" ,iso-codes)))
+ (list fcitx5
+ fcitx5-qt
+ qtbase-5
+ qtx11extras
+ qtdeclarative-5
+ qtquickcontrols2-5
+ ki18n
+ kpackage
+ kdeclarative
+ kiconthemes
+ kcoreaddons
+ plasma-framework
+ kitemviews
+ kwidgetsaddons
+ kwindowsystem
+ kirigami
+ libxkbcommon
+ libx11
+ xkeyboard-config
+ libxkbfile
+ gettext-minimal
+ iso-codes))
(native-inputs
(list extra-cmake-modules pkg-config))
(home-page "https://github.com/fcitx/fcitx5-configtool")
--
2.41.0
?