[PATCH]: Update fcitx5 and its components.

  • Done
  • quality assurance status badge
Details
2 participants
  • Zhu Zihao
  • Leo Famulari
Owner
unassigned
Submitted by
Zhu Zihao
Severity
normal
Z
Z
Zhu Zihao wrote on 22 Jan 2021 12:30
(address . guix-patches@gnu.org)
864kj98azj.fsf@163.com

-----BEGIN PGP SIGNATURE-----

iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYAq3YBUcYWxsX2J1dF9s
YXN0QDE2My5jb20ACgkQvkKzUqn2gh/EfgEA9FVukupVXsiTp2gn/1FBQ2IgcCHF
GZXTk6jAojBv+UEBAMiSKSo6hJ79VNoOr1z+BBiCEgf31AJD1BuRFGQIvlgK
=I3Wo
-----END PGP SIGNATURE-----

From 4c4d75b5108fc0927dd1706efcf299dbaa37eaa1 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Tue, 19 Jan 2021 17:49:22 +0800
Subject: [PATCH 1/9] gnu: fcitx5-configtool: Fix indentation.

* gnu/packages/fcitx5.scm(fcitx5-configtool): Fix indentation.
---
gnu/packages/fcitx5.scm | 70 ++++++++++++++++++++---------------------
1 file changed, 35 insertions(+), 35 deletions(-)

Toggle diff (84 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index ed0d928fc7..76219de55e 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -342,42 +342,42 @@ including input methods previous bundled inside Fcitx 4:
(define-public fcitx5-configtool
(package
- (name "fcitx5-configtool")
- (version "5.0.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://download.fcitx-im.org/fcitx5"
- "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
- (sha256
- (base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b"))))
- (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)
- ("qtx11extras" ,qtx11extras)
- ("kitemviews" ,kitemviews)
- ("kwidgetsaddons" ,kwidgetsaddons)
- ("libx11" ,libx11)
- ("xkeyboard-config" ,xkeyboard-config)
- ("libxkbfile" ,libxkbfile)
- ("gettext" ,gettext-minimal)
- ("iso-codes" ,iso-codes)))
- (native-inputs
- `(("gcc" ,gcc-9)
- ("extra-cmake-modules" ,extra-cmake-modules)
- ("pkg-config" ,pkg-config)))
- (home-page "https://github.com/fcitx/fcitx5-configtool")
- (synopsis "Graphical configuration tool for Fcitx 5")
- (description "Fcitx5-configtool is a graphical configuration tool
+ (name "fcitx5-configtool")
+ (version "5.0.1")
+ (source
+ (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://download.fcitx-im.org/fcitx5"
+ "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
+ (sha256
+ (base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b"))))
+ (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)
+ ("qtx11extras" ,qtx11extras)
+ ("kitemviews" ,kitemviews)
+ ("kwidgetsaddons" ,kwidgetsaddons)
+ ("libx11" ,libx11)
+ ("xkeyboard-config" ,xkeyboard-config)
+ ("libxkbfile" ,libxkbfile)
+ ("gettext" ,gettext-minimal)
+ ("iso-codes" ,iso-codes)))
+ (native-inputs
+ `(("gcc" ,gcc-9)
+ ("extra-cmake-modules" ,extra-cmake-modules)
+ ("pkg-config" ,pkg-config)))
+ (home-page "https://github.com/fcitx/fcitx5-configtool")
+ (synopsis "Graphical configuration tool for Fcitx 5")
+ (description "Fcitx5-configtool is a graphical configuration tool
to manage different input methods in Fcitx 5.")
- (license license:gpl2+)))
+ (license license:gpl2+)))
(define-public fcitx5-material-color-theme
(package
--
2.30.0
--
Retrieve my PGP public key:

gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao
Z
Z
Zhu Zihao wrote on 22 Jan 2021 12:35
Re: bug#46032: Acknowledgement ([PATCH]: Update fcitx5 and its components.)
(address . 46032@debbugs.gnu.org)
86sg6t6w78.fsf@163.com

-----BEGIN PGP SIGNATURE-----

iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYAq4exUcYWxsX2J1dF9s
YXN0QDE2My5jb20ACgkQvkKzUqn2gh9exAD+KWuWxfdHfoqWd9aMi66EOYdGJfwa
8aHv5nrLhaz236MA/0Yxn23GgkTZiZghCckWGX/0hFuheco4Dqt4mwJjx50D
=6z3R
-----END PGP SIGNATURE-----

From 2e060b3d5eeddcceca161833e14f8ec430642d28 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Tue, 19 Jan 2021 17:54:02 +0800
Subject: [PATCH 2/9] gnu: xcb-imdkit: Update to 1.0.2.

* gnu/packages/fcitx5.scm(xcb-imdkit): Update to 1.0.2.
---
gnu/packages/fcitx5.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 76219de55e..ff9a1153a7 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -51,7 +51,7 @@
(define-public xcb-imdkit
(package
(name "xcb-imdkit")
- (version "1.0.1")
+ (version "1.0.2")
(source
(origin
(method url-fetch)
@@ -59,7 +59,7 @@
"https://download.fcitx-im.org/fcitx5/xcb-imdkit/xcb-imdkit-"
version ".tar.xz"))
(sha256
- (base32 "1qgbbp8y8ci7haz99vgbrgpjsbrwwyjianyhdvxcirnbm5bybvmz"))
+ (base32 "16f7jdnrr8lrll7qvnj0gh3gwzgn5idfsc9rwi1gp1n2mnjrs7w0"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.30.0
From 76533e56c805189f22a888214e4d8b0cbbd7899e Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 22 Jan 2021 19:02:26 +0800
Subject: [PATCH 3/9] gnu: libime: Update to 1.0.3.

* gnu/packages/fcitx5.scm(libime): Update to 1.0.3.
---
gnu/packages/fcitx5.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (23 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index ff9a1153a7..0e3fe152cd 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -171,14 +171,14 @@ client.")
(define-public libime
(package
(name "libime")
- (version "1.0.2")
+ (version "1.0.3")
(source
(origin
(method url-fetch)
(uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
version "_dict.tar.xz"))
(sha256
- (base32 "006pncby7p6h3rnicckzjwi6jzsrqiqbj6p9bpic80lanlllgw31"))))
+ (base32 "1gi9ylqha9x3dhjsa2i7x9wh2g9vgqkkfr6s1facs2ky65vgvdrv"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
--
2.30.0
From 4b8d554cadb48031013c5e466b0cc68dd0676f24 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Tue, 19 Jan 2021 17:54:39 +0800
Subject: [PATCH 4/9] gnu: fcitx5: Update to 5.0.4.

* gnu/packages/fcitx5.scm(fcitx5): Update to 5.0.4.
---
gnu/packages/fcitx5.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 0e3fe152cd..6a68c4e869 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -86,7 +86,7 @@ client.")
(define-public fcitx5
(package
(name "fcitx5")
- (version "5.0.3")
+ (version "5.0.4")
(source
(origin
(method url-fetch)
@@ -94,7 +94,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
version "_dict.tar.xz"))
(sha256
- (base32 "06zkb33m2rnhg385iy79n3r4svz5jbav74di61xqa3lhbv7534s3"))))
+ (base32 "14pqbjbdc3b5xlycm92gs1rgkmpykfnyls3gfr608902lk2lw5as"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.30.0
From 76276dba31794cc4b266d3b146886871da3775ff Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Tue, 19 Jan 2021 17:55:15 +0800
Subject: [PATCH 5/9] gnu: fcitx5-lua: Update to 5.0.2.

* gnu/packages/fcitx5.scm(fcitx5-lua): Update to 5.0.2.
---
gnu/packages/fcitx5.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 6a68c4e869..036d2009b1 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -146,7 +146,7 @@ client.")
(define-public fcitx5-lua
(package
(name "fcitx5-lua")
- (version "5.0.1")
+ (version "5.0.2")
(source
(origin
(method url-fetch)
@@ -154,7 +154,7 @@ client.")
"https://download.fcitx-im.org/fcitx5/fcitx5-lua/fcitx5-lua-"
version ".tar.xz"))
(sha256
- (base32 "177mj56j8yrl79hvk7bbrifvm137np23pwalv83ibgk4l51z92hf"))))
+ (base32 "0y5yc9102bz681f4wj6xqjxmfdmrshz3fhf39pa61718hkyy9lih"))))
(build-system cmake-build-system)
(inputs
`(("fcitx5" ,fcitx5)
--
2.30.0
From a4e6d2e1877380671ceb4f1459473904f85ddb14 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Tue, 19 Jan 2021 17:55:33 +0800
Subject: [PATCH 6/9] gnu: fcitx5-chinese-addons: Update to 5.0.3.

* gnu/packages/fcitx5.scm(fcitx5-chinese-addons): Update to 5.0.3.
---
gnu/packages/fcitx5.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 036d2009b1..14de450f37 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -282,7 +282,7 @@ for Qt based application.")
(define-public fcitx5-chinese-addons
(package
(name "fcitx5-chinese-addons")
- (version "5.0.2")
+ (version "5.0.3")
(source
(origin
(method url-fetch)
@@ -290,7 +290,7 @@ for Qt based application.")
"/fcitx5-chinese-addons/fcitx5-chinese-addons-"
version "_dict.tar.xz"))
(sha256
- (base32 "0mf91gzwzhfci0jn6g3l516xjw8r4v40ginnbl70h1zx6vr24rfp"))))
+ (base32 "1kmzbllk0g86m2z3piwn9j84ihxixyxzv7rzj832xfvwqgk7gixk"))))
(build-system cmake-build-system)
(arguments
`(#:phases
--
2.30.0
From 9c90e21cf6d6d8911b62897c98bfd3d07f44a0a9 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 22 Jan 2021 17:56:00 +0800
Subject: [PATCH 7/9] gnu: fcitx5-gtk: Update to 5.0.3.

* gnu/packages/fcitx5.scm(fcitx5-gtk): Update to 5.0.3.
---
gnu/packages/fcitx5.scm | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)

Toggle diff (35 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 14de450f37..982536a949 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -196,7 +196,7 @@ editors.")
(define-public fcitx5-gtk
(package
(name "fcitx5-gtk")
- (version "5.0.1")
+ (version "5.0.3")
(source
(origin
(method url-fetch)
@@ -204,7 +204,7 @@ editors.")
"/fcitx5-gtk/fcitx5-gtk-"
version ".tar.xz"))
(sha256
- (base32 "0h53liraqc5nz4nyi3ixdfdw3zzkdcsiff7j25acc3gmaa5gyij7"))))
+ (base32 "18bwwj9a5v82c6ssc8560hd8vwykakvg6sfijwdb5jswk9mafvgj"))))
(build-system cmake-build-system)
(arguments
`(#:tests? #f ;No test
@@ -212,7 +212,9 @@ editors.")
(list (string-append "-DGOBJECT_INTROSPECTION_GIRDIR="
%output "/share/gir-1.0")
(string-append "-DGOBJECT_INTROSPECTION_TYPELIBDIR="
- %output "/lib/girepository-1.0"))
+ %output "/lib/girepository-1.0")
+ ;; TODO: Enable it when Guix has GTK4.
+ "-DENABLE_GTK4_IM_MODULE=Off")
#:phases
(modify-phases %standard-phases
(add-before 'configure 'patch-install-prefix
--
2.30.0
From 1d1edbcb4c264e96216ddf864530bf897db95158 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Fri, 22 Jan 2021 17:56:51 +0800
Subject: [PATCH 8/9] gnu: fcitx5-qt: Update to 5.0.2.

* gnu/packages/fcitx5.scm(fcitx5-qt): Update to 5.0.2.
---
gnu/packages/fcitx5.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 982536a949..2ab576df21 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -249,7 +249,7 @@ for GTK+2/GTK+3 application.")
(define-public fcitx5-qt
(package
(name "fcitx5-qt")
- (version "5.0.1")
+ (version "5.0.2")
(source
(origin
(method url-fetch)
@@ -257,7 +257,7 @@ for GTK+2/GTK+3 application.")
"/fcitx5-qt/fcitx5-qt-"
version ".tar.xz"))
(sha256
- (base32 "0ilhb4yw9k3m1c4fidnv3nd5dgm9xxds11dgdys6gswjjnmcgqqm"))))
+ (base32 "15rn111mrp6lcgm0ka3vb6a6qwkv6kqkqn563wsm49n16iy1dhqj"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.30.0
From 2a26a626b3e5a1983b73f3ec54d52778f0c21549 Mon Sep 17 00:00:00 2001
From: Zhu Zihao <all_but_last@163.com>
Date: Tue, 19 Jan 2021 17:55:56 +0800
Subject: [PATCH 9/9] gnu: fcitx5-configtool: Update to 5.0.2.

* gnu/packages/fcitx5.scm(fcitx5-configtool): Update to 5.0.2.
---
gnu/packages/fcitx5.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 2ab576df21..79d5799774 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -345,7 +345,7 @@ including input methods previous bundled inside Fcitx 4:
(define-public fcitx5-configtool
(package
(name "fcitx5-configtool")
- (version "5.0.1")
+ (version "5.0.2")
(source
(origin
(method url-fetch)
@@ -353,7 +353,7 @@ including input methods previous bundled inside Fcitx 4:
"https://download.fcitx-im.org/fcitx5"
"/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
(sha256
- (base32 "0mrqhzvab41hkvhkz7vkb8d2mv5bgx4aqp9jpz4kf3kskwm1q14b"))))
+ (base32 "0rpk3yn572pcr29jak63x84g0qgj8hj011aw8gmxjah9311nxhpb"))))
(build-system cmake-build-system)
(arguments
`(#:configure-flags
--
2.30.0
--
Retrieve my PGP public key:

gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao
Z
Z
Zhu Zihao wrote on 29 Jan 2021 02:56
(address . 46032@debbugs.gnu.org)
86pn1oa4ll.fsf@163.com
ping.
--
Retrieve my PGP public key:

gpg --recv-keys D47A9C8B2AE3905B563D9135BE42B352A9F6821F

Zihao
-----BEGIN PGP SIGNATURE-----

iIsEARYIADMWIQTUepyLKuOQW1Y9kTW+QrNSqfaCHwUCYBNrNxUcYWxsX2J1dF9s
YXN0QDE2My5jb20ACgkQvkKzUqn2gh/LlwEAxB8PshFiyrt2nr+5IEerneYWdJ1i
SHdag5UgnoixgVMBAOjyhXJZ3IcqSpDW3rHVwHxw4L4REx+tLBUM0/31EmQG
=uR3E
-----END PGP SIGNATURE-----

L
L
Leo Famulari wrote on 2 Feb 2021 01:43
Re: [bug#46032] Acknowledgement ([PATCH]: Update fcitx5 and its components.)
(name . Zhu Zihao)(address . all_but_last@163.com)(address . 46032-done@debbugs.gnu.org)
YBigRiNgG+yuC2Mb@jasmine.lan
On Fri, Jan 29, 2021 at 09:56:06AM +0800, Zhu Zihao wrote:
Toggle quote (3 lines)
>
> ping.

I believe these were pushed in commit 00a04b8ad927fb262dfcfe187f47bc8cd8d03804

Please let us know if there are any outstanding patches in this ticket.
-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEsFFZSPHn08G5gDigJkb6MLrKfwgFAmAYoEYACgkQJkb6MLrK
fwjtphAA17wCVyt1QavnAPiYLvSKvWDfSBRXVcFze4AAlaXHVKQGwV/CLgjE0GXh
0Kld9Qhn2fRLswvnQxH4Hkx8rNydLstZ4vKfpkPuvpaEIY32Nqd/n9EwkGBnIBya
m9ApP3eQ85rdj4xqkTbZ3GMlfoNAkHb+QNhU8xCT+XAJbt4096KSQCbyP4OdrTKI
NnIA8k8rDNDWvuofZm8bvDEUJ6skY/w/brYWbpdiNV3T9OM/joBZhhrr8dXSkW0k
DGzxn8FhS6VYdYGb1DQF/nC6O2qTrnr84YV/zzHrid+Losv94SZii7+oOSRmAYk9
r8HLykgMHTFgKN63zRzwjUCtjKUAk+RpbSIBryIqHw4010/3JqnLjtwY/1vfvlYh
a2npwjYRZRXmUdx9H6S0Sr+F8sbRkBj13KEnFjwNjsSNHjEkymy0M8VSCeT0Pno7
Sj83+8AXEhS2dbh5bAZVVJkkvWEzu5xim5pvhlcxcRTrvucncnVTzsuOLDUTA+8A
P0h4+75w0n+ZPt0BTiJhp0usWGF28FbZYGWUnJvIx91lC1LOs3seJI5DUZTJOqL0
hP44Xjr1mknIEhVnKsDZ2QojupfE54SIBBZ5vMP1tpF+CHKmoRnMyTWqrP++821R
Z9Z3NM1J4k3+6L5Fa1GhJDoQcthWWLtOe4TXdM9PTfTgJmJWGEI=
=OP1f
-----END PGP SIGNATURE-----


Closed
?