[bug#59084] [PATCH 0/7] gnu: Add fcitx5-rime.

[bug#59084] [PATCH 0/7] gnu: Add fcitx5-rime.

[dan]

This patch series updates several fcitx5 related packages and adds fcitx5-rime.

dan (7):
  gnu: fcitx5: Update to 5.0.19.
  gnu: libime: Update to 1.0.14.
  gnu: fcitx5-gtk: Update to 5.0.19.
  gnu: fcitx5-qt: Update to 5.0.15.
  gnu: fcitx5-chinese-addons: Update to 5.0.15.
  gnu: fcitx5-configtool: Update to 5.0.15.
  gnu: Add fcitx5-rime.

 gnu/packages/fcitx5.scm | 70 ++++++++++++++++++++++++++++++++++-------
 1 file changed, 58 insertions(+), 12 deletions(-)


base-commit: 1b117fc3a5623d582758e890b4ab64d0637368cd
-- 
2.38.0

[bug#59084] [PATCH 1/7] gnu: fcitx5: Update to 5.0.19.

[dan]

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

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 5a015ce070..b3e3844ede 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -85,7 +85,7 @@ (define-public xcb-imdkit
 (define-public fcitx5
   (package
     (name "fcitx5")
-    (version "5.0.10")
+    (version "5.0.19")
     (source
      (origin
        (method url-fetch)
@@ -93,7 +93,7 @@ (define-public fcitx5
              "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
              version "_dict.tar.xz"))
        (sha256
-        (base32 "0i23skr49n6b30ybm66bkv07dcr0dan5mzxch7x83znfnrpk8z3h"))))
+        (base32 "13zp6f8z590m34yjfzkw1jckvw1k0p8gzbkwm9lfzbrz9pzgdl1p"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.38.0

[bug#59084] [PATCH 2/7] gnu: libime: Update to 1.0.14.

[dan]

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

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index b3e3844ede..634c0395c4 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -166,14 +166,14 @@ (define-public fcitx5-lua
 (define-public libime
   (package
     (name "libime")
-    (version "1.0.10")
+    (version "1.0.14")
     (source
      (origin
        (method url-fetch)
        (uri (string-append "https://download.fcitx-im.org/fcitx5/libime/libime-"
                            version "_dict.tar.xz"))
        (sha256
-        (base32 "0dknxf5lf5a6kam39rp7y1h2p47bwb6pnlc8fsrhmiv7rw2pkq0f"))))
+        (base32 "0qvi9wpm4hx42h05bd4ngwzr4sv4x7i18m3ppzwc8n6q3sz5cfbh"))))
     (build-system cmake-build-system)
     (inputs
      (list fcitx5 boost))
-- 
2.38.0

[bug#59084] [PATCH 3/7] gnu: fcitx5-gtk: Update to 5.0.19.

[dan]

* gnu/packages/fcitx5.scm (fcitx5-gtk): Update to 5.0.19.
* gnu/packages/fcitx5.scm (fcitx5-gtk4) [phases]: Make
gtk4/gtk4inputwindow.cpp properly find fcitxtheme.h.
---
 gnu/packages/fcitx5.scm | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 634c0395c4..3bc0636fb8 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -188,7 +188,7 @@ (define-public libime
 (define-public fcitx5-gtk
   (package
     (name "fcitx5-gtk")
-    (version "5.0.9")
+    (version "5.0.19")
     (source
      (origin
        (method url-fetch)
@@ -196,7 +196,7 @@ (define-public fcitx5-gtk
                            "/fcitx5-gtk/fcitx5-gtk-"
                            version ".tar.xz"))
        (sha256
-        (base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n"))))
+        (base32 "007ls91jfbs3anvcfbza1pjbbsi7q5nrw7f3nzdbyngsl3nj6k37"))))
     (build-system cmake-build-system)
     (arguments
      (list
@@ -275,6 +275,11 @@ (define-public fcitx5-gtk4
               "-DENABLE_GTK3_IM_MODULE=OFF")
       #:phases
       #~(modify-phases %standard-phases
+          (add-before 'configure 'fix-fcitxtheme-path
+            (lambda _
+              (substitute* "gtk4/gtk4inputwindow.cpp"
+                (("<gtk3/fcitxtheme.h>")
+                 "\"fcitxtheme.h\""))))
           (add-before 'configure 'fix-gclient
             (lambda* (#:key inputs #:allow-other-keys)
               (define gclient
-- 
2.38.0

[bug#59084] [PATCH 4/7] gnu: fcitx5-qt: Update to 5.0.15.

[dan]

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

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 3bc0636fb8..10d7cade64 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -306,7 +306,7 @@ (define gclient
 (define-public fcitx5-qt
   (package
     (name "fcitx5-qt")
-    (version "5.0.7")
+    (version "5.0.15")
     (source
      (origin
        (method url-fetch)
@@ -314,7 +314,7 @@ (define-public fcitx5-qt
                            "/fcitx5-qt/fcitx5-qt-"
                            version ".tar.xz"))
        (sha256
-        (base32 "1gspj3s1nz6mqbp3z6js5zf7mqicwm32isxlqh6whhwawr9w7vrk"))))
+        (base32 "1a21fgfsdpxxchpd5bjb7f2aj3fk7i4iawgs491974y7ad1kqx11"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.38.0

[bug#59084] [PATCH 5/7] gnu: fcitx5-chinese-addons: Update to 5.0.15.

[dan]

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

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 10d7cade64..18d718aba7 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -365,7 +365,7 @@ (define-public fcitx5-anthy
 (define-public fcitx5-chinese-addons
   (package
     (name "fcitx5-chinese-addons")
-    (version "5.0.6")
+    (version "5.0.15")
     (source
      (origin
        (method url-fetch)
@@ -373,7 +373,7 @@ (define-public fcitx5-chinese-addons
                            "/fcitx5-chinese-addons/fcitx5-chinese-addons-"
                            version "_dict.tar.xz"))
        (sha256
-        (base32 "11l76gpcfm0x1f6x5m9s37q7ffa7xcsdydlzjdz2s6kk45fvvq89"))))
+        (base32 "0l3qa958ngb19ydm4jsm44yvw2gn3p6gfjvknm4iv4fdazcr4plp"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.38.0

[bug#59084] [PATCH 6/7] gnu: fcitx5-configtool: Update to 5.0.15.

[dan]

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

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 18d718aba7..7e19159844 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -429,7 +429,7 @@ (define-public fcitx5-chinese-addons
 (define-public fcitx5-configtool
   (package
     (name "fcitx5-configtool")
-    (version "5.0.8")
+    (version "5.0.15")
     (source
      (origin
        (method url-fetch)
@@ -437,7 +437,7 @@ (define-public fcitx5-configtool
              "https://download.fcitx-im.org/fcitx5"
              "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
        (sha256
-        (base32 "0rajrw914mbl0x7h08cal0sszwyvqg6v3w0vs0c9acs6m438xbw4"))))
+        (base32 "1k5qmwp2v8k2r1lvagdy6ffsafcqkx4k803j9a0fm5pp5yz0ibk8"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.38.0

[bug#59084] [PATCH 7/7] gnu: Add fcitx5-rime.

[dan]

* gnu/packages/fcitx5.scm (fcitx5-rime): New variable.
---
 gnu/packages/fcitx5.scm | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 7e19159844..8c8677ab7c 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -2,6 +2,7 @@
 ;;; Copyright © 2020, 2022 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
 ;;; Copyright © 2022 Dominic Martinez <dom@dominicm.dev>
+;;; Copyright © 2022 dan <i@dan.games>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -35,6 +36,7 @@ (define-module (gnu packages fcitx5)
   #:use-module (gnu packages gettext)
   #:use-module (gnu packages glib)
   #:use-module (gnu packages gtk)
+  #:use-module (gnu packages ibus)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages kde-frameworks)
   #:use-module (gnu packages libevent)
@@ -532,3 +534,42 @@ (define (install-theme-variant variant target)
 @item DeepPurple
 @end itemize\n")
     (license license:asl2.0)))
+
+(define-public fcitx5-rime
+  (package
+    (name "fcitx5-rime")
+    (version "5.0.14")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "https://download.fcitx-im.org/fcitx5"
+                                  "/fcitx5-rime/fcitx5-rime-" version
+                                  ".tar.xz"))
+              (sha256
+               (base32
+                "1i8wb7pbjifz48j4c18lp07ms1a2wc3p9d9g13dgimgf9yi64brm"))))
+    (build-system cmake-build-system)
+    (arguments
+     '(#:tests? #f ;no tests
+       #:configure-flags (list (string-append "-DRIME_DATA_DIR="
+                                              (assoc-ref %build-inputs
+                                                         "rime-data")
+                                              "/share/rime-data"))
+       #:phases (modify-phases %standard-phases
+                  (add-after 'unpack 'patch-source
+                    (lambda _
+                      (substitute* "data/CMakeLists.txt"
+                        (("DESTINATION....RIME_DATA_DIR..")
+                         "DESTINATION \"${CMAKE_INSTALL_DATADIR}/rime-data\""))
+                      #t)))))
+    (inputs (list fcitx5 librime rime-data))
+    (native-inputs (list gettext-minimal extra-cmake-modules pkg-config))
+    (home-page "https://github.com/fcitx/fcitx5-rime")
+    (synopsis "Rime Input Method Engine for Fcitx 5")
+    (description
+     "@dfn{fcitx5-rime} provides the Rime input method engine for fcitx5.
+Rime is a lightweight, extensible input method engine supporting various input
+schemas including glyph-based input methods, romanization-based input methods
+as well as those for Chinese dialects.  It has the ability to compose phrases
+and sentences intelligently and provide very accurate traditional Chinese
+output.")
+    (license license:lgpl2.1+)))
-- 
2.38.0

bug#59084: [PATCH 0/7] gnu: Add fcitx5-rime.

[宋文武 via Guix-patches via]

dan <i@dan.games> writes:

> This patch series updates several fcitx5 related packages and adds fcitx5-rime.
>
> dan (7):
>   gnu: fcitx5: Update to 5.0.19.
>   gnu: libime: Update to 1.0.14.
>   gnu: fcitx5-gtk: Update to 5.0.19.
>   gnu: fcitx5-qt: Update to 5.0.15.
>   gnu: fcitx5-chinese-addons: Update to 5.0.15.
>   gnu: fcitx5-configtool: Update to 5.0.15.
>   gnu: Add fcitx5-rime.
>
>  gnu/packages/fcitx5.scm | 70 ++++++++++++++++++++++++++++++++++-------
>  1 file changed, 58 insertions(+), 12 deletions(-)

All pushed, thank you!