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

  • Done
  • quality assurance status badge
Details
3 participants
  • Christopher Baines
  • Nicolas Graves
  • 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
N
N
Nicolas Graves wrote on 13 May 14:37 +0200
QA review for 70623
87seyl28gr.fsf@ngraves.fr
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
C
C
Christopher Baines wrote on 13 May 22:49 +0200
Re: [bug#70623] [PATCH 0/2] fcitx5-configtool: enable kcm and remove inputs label
(name . Zheng Junjie)(address . zhengjunjie@iscas.ac.cn)
87o7991loz.fsf@cbaines.net
Zheng Junjie <zhengjunjie@iscas.ac.cn> writes:

Toggle quote (7 lines)
> 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
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmZCfOxfFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XcTPA//Yb7hEU6S+6UCk7mTYnncHQwIUAO6tyf2
akxeroqMorq8CtyYOCRq0W8sPRj1rCPVAqw/Gl89kNuZE0xaVAETHAoX/N/BDOqv
i1yzUuuS8LmXwuAMtyUjfhZ/1c2EYSpDQAyEOIdlyEgNuQoDQOMg9WmwsUK5XMkD
NAi1OXF1oESsD1JzwtV/ogC2FBMHDHn2dxa0ar2Ha3Scl4wjBGuOxV1VtMx0SK2/
P1OIMB5ZnFs1mAxeB0d47mPTHI/qtBOVUAvbDAMJh6S1k9FdLHNIytzrzM9fk6pG
du96eDyeIu0FOpvQy/BGIrBn3WdfzfqihwS2I6hqenVZ5HaYOnK2FT5OknoX4G0+
7vUpt9y9BKy8udXp/lcP0sQKO+haMBwOUg1XbIV47tpXgSAUJ+JcVcBqJr8e7ze0
sP0C90wDJ3LztIoHvkqdsQ2d6z4UcjObc+ZWKk1sKZEgj1WjWviFEkC1DxDOibYE
0ErIXLfmA6nCJgeG9Or4HDzZlXcQ8PlWjBC1t6DwTjpGwXcB1MMtAEExsBUyIf/F
fHzPcLlVN258v7a+a0xwcThqD+8cgPAnF2hflEnxlYSl6rXYN76TSsZe3JlSyZj7
IbycLGlb0oWYE/l/F+lqIojJoft7wZlO+TGBL6nmXKgAFzdvc/E9t6wcUmkU84/G
FQEQ1R/p74k=
=+L9k
-----END PGP SIGNATURE-----

Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 70623@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 70623
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch