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

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

[Zheng Junjie]

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

[bug#70623] [PATCH 1/2] gnu: fcitx5-configtool: Enable kcm support.

[Zheng Junjie]

* 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(-)

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

[bug#70623] [PATCH 2/2] gnu: fcitx5-configtool: Remove inputs label.

[Zheng Junjie]

* gnu/packages/fcitx5.scm (fcitx5-configtool)
[inputs]: Remove label.

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

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

[bug#70623] QA review for 70623

[Nicolas Graves via Guix-patches via]

user guix
usertag 70623 + reviewed-looks-good
thanks

Guix QA review form submission:
LGTM

Items marked as checked: Lint warnings, Package builds, Commit messages

-- 
Best regards,
Nicolas Graves

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

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 383 bytes --]

Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

> 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(-)

Thanks both, I've pushed this to master as
a5455ed672c350a63989d5afb6caef3975cb7410.

Chris

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]