[bug#51667] [PATCH] Several patches about fcitx5

[dan <igaryhe@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 372 bytes --]

Hi, I would like to submit several patches I made about fcitx5, including:
- 0001: add fcitx5-rime
- 0002: let fcitx5 export XDG_DATA_DIRS
- 0003: update fcitx5 to 5.0.10
- 0004: update fcitx5-gtk to 5.0.9
- 0005: update fcitx5-qt to 5.0.7
- 0006: update fcitx5-configtool to 5.0.8

This is my first time submitting patches, if there is anything wrong please
let me know.

[-- Attachment #1.2: Type: text/html, Size: 493 bytes --]

[-- Attachment #2: 0001-gnu-Add-fcitx5-rime.patch --]
[-- Type: application/octet-stream, Size: 2382 bytes --]

From a1eaefe5ed53e10dc8c4249372a7d33000b964fd Mon Sep 17 00:00:00 2001
From: dan <igaryhe@gmail.com>
Date: Sun, 7 Nov 2021 21:54:05 +0800
Subject: [PATCH 1/6] gnu: Add fcitx5-rime.

---
 gnu/packages/fcitx5.scm | 41 ++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 40 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 737f47f20f..ea19cc245a 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -47,7 +47,8 @@ (define-module (gnu packages fcitx5)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xml)
-  #:use-module (gnu packages xorg))
+  #:use-module (gnu packages xorg)
+  #:use-module (gnu packages ibus))
 
 (define-public xcb-imdkit
   (package
@@ -453,3 +454,41 @@ (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.8")
+    (source
+     (origin
+       (method git-fetch)
+       (uri (git-reference
+	     (url "https://github.com/fcitx/fcitx5-rime")
+	     (commit version)))
+       (sha256
+        (base32
+         "17fi36m70d8gwwyragms4rl7xjx4k7g5ixs8rcj8r2ph1ak9ymhy"))))
+    (build-system cmake-build-system)
+    (arguments
+     `(#:tests? #f
+       #:configure-flags
+       (list (string-append "-DRIME_DATA_DIR="
+			    (assoc-ref %build-inputs "rime-data")
+			    "/share/rime-data"))))
+    (inputs
+     `(("gettext", gettext-minimal)
+       ("fcitx5", fcitx5)
+       ("librime", librime)
+       ("rime-data", rime-data)))
+    (native-inputs
+     `(("extra-cmake-modules", extra-cmake-modules)
+       ("pkg-config", pkg-config)))
+    (home-page "https://github.com/fcitx/fcitx5-rime")
+    (synopsis "Rime Input Method Engine for fcitx5")
+    (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.33.1


[-- Attachment #3: 0006-gnu-fcitx5-configtool-Update-to-5.0.8.patch --]
[-- Type: application/octet-stream, Size: 1158 bytes --]

From 1d7bd982d30b80e5b8b28251b06b1f4a2f6208b9 Mon Sep 17 00:00:00 2001
From: dan <igaryhe@gmail.com>
Date: Sun, 7 Nov 2021 22:08:37 +0800
Subject: [PATCH 6/6] gnu: fcitx5-configtool: Update to 5.0.8.

---
 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 3b07897a06..c232babff1 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -352,7 +352,7 @@ (define-public fcitx5-chinese-addons
 (define-public fcitx5-configtool
   (package
     (name "fcitx5-configtool")
-    (version "5.0.5")
+    (version "5.0.8")
     (source
      (origin
        (method url-fetch)
@@ -360,7 +360,7 @@ (define-public fcitx5-configtool
              "https://download.fcitx-im.org/fcitx5"
              "/fcitx5-configtool/fcitx5-configtool-" version ".tar.xz"))
        (sha256
-        (base32 "1diwiniqvsvcdwzcx1dqxbvwsr6ajbxs67my0cpn8n22asd5mx8i"))))
+        (base32 "0rajrw914mbl0x7h08cal0sszwyvqg6v3w0vs0c9acs6m438xbw4"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.33.1


[-- Attachment #4: 0005-gnu-fcitx5-qt-Update-to-5.0.7.patch --]
[-- Type: application/octet-stream, Size: 1088 bytes --]

From fa6b52b104b09cc2782714acca355e1e674663f7 Mon Sep 17 00:00:00 2001
From: dan <igaryhe@gmail.com>
Date: Sun, 7 Nov 2021 22:06:56 +0800
Subject: [PATCH 5/6] gnu: fcitx5-qt: Update to 5.0.7.

---
 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 b52f463d45..3b07897a06 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -256,7 +256,7 @@ (define-public fcitx5-gtk
 (define-public fcitx5-qt
   (package
     (name "fcitx5-qt")
-    (version "5.0.6")
+    (version "5.0.7")
     (source
      (origin
        (method url-fetch)
@@ -264,7 +264,7 @@ (define-public fcitx5-qt
                            "/fcitx5-qt/fcitx5-qt-"
                            version ".tar.xz"))
        (sha256
-        (base32 "0wp88cmy0gn15gkfzl5z4q4qd9j1ssdmgp1rfsbw0cp3qh5x4m69"))))
+        (base32 "1gspj3s1nz6mqbp3z6js5zf7mqicwm32isxlqh6whhwawr9w7vrk"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.33.1


[-- Attachment #5: 0003-gnu-fcitx5-Update-to-5.0.10.patch --]
[-- Type: application/octet-stream, Size: 1081 bytes --]

From 0aac118a4c23589ebc9898237345edb5687bbbe8 Mon Sep 17 00:00:00 2001
From: dan <igaryhe@gmail.com>
Date: Sun, 7 Nov 2021 22:02:31 +0800
Subject: [PATCH 3/6] gnu: fcitx5: Update to 5.0.10.

---
 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 08120e3b36..5c7678c145 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -88,7 +88,7 @@ (define-public xcb-imdkit
 (define-public fcitx5
   (package
     (name "fcitx5")
-    (version "5.0.8")
+    (version "5.0.10")
     (source
      (origin
        (method url-fetch)
@@ -96,7 +96,7 @@ (define-public fcitx5
              "https://download.fcitx-im.org/fcitx5/fcitx5/fcitx5-"
              version "_dict.tar.xz"))
        (sha256
-        (base32 "0536sjpgjlg0bf8imz4jf9bdsp7fhm09bkssddji56cc9mgdxx82"))))
+        (base32 "0i23skr49n6b30ybm66bkv07dcr0dan5mzxch7x83znfnrpk8z3h"))))
     (build-system cmake-build-system)
     (arguments
      `(#:configure-flags
-- 
2.33.1


[-- Attachment #6: 0002-gnu-fcitx5-Add-native-search-path-XDG_DATA_DIRS.patch --]
[-- Type: application/octet-stream, Size: 999 bytes --]

From a646e2dee7e9f30c1583fb5345923af5b7a2380d Mon Sep 17 00:00:00 2001
From: dan <igaryhe@gmail.com>
Date: Sun, 7 Nov 2021 21:57:24 +0800
Subject: [PATCH 2/6] gnu: fcitx5: Add native search path XDG_DATA_DIRS.

---
 gnu/packages/fcitx5.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index ea19cc245a..08120e3b36 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -140,7 +140,10 @@ (define-public fcitx5
     (native-search-paths
      (list (search-path-specification
             (variable "FCITX_ADDON_DIRS")
-            (files '("lib/fcitx5")))))
+            (files '("lib/fcitx5")))
+           (search-path-specification
+            (variable "XDG_DATA_DIRS")
+            (files '("share")))))
     (home-page "https://github.com/fcitx/fcitx5")
     (synopsis "Input method framework")
     (description "Fcitx 5 is a generic input method framework.")
-- 
2.33.1


[-- Attachment #7: 0004-gnu-fcitx5-gtk-Update-to-5.0.9.patch --]
[-- Type: application/octet-stream, Size: 1114 bytes --]

From b60258ded99293114e0663fc73c0bde4d9154a18 Mon Sep 17 00:00:00 2001
From: dan <igaryhe@gmail.com>
Date: Sun, 7 Nov 2021 22:05:08 +0800
Subject: [PATCH 4/6] gnu: fcitx5-gtk: Update to 5.0.9.

---
 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 5c7678c145..b52f463d45 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -202,7 +202,7 @@ (define-public libime
 (define-public fcitx5-gtk
   (package
     (name "fcitx5-gtk")
-    (version "5.0.7")
+    (version "5.0.9")
     (source
      (origin
        (method url-fetch)
@@ -210,7 +210,7 @@ (define-public fcitx5-gtk
                            "/fcitx5-gtk/fcitx5-gtk-"
                            version ".tar.xz"))
        (sha256
-        (base32 "0x9xwyb3hnb2xl47jkj8zs34fhyf7gshy3bv3jxd66sfkjrscr5v"))))
+        (base32 "07ip4sxf3q895pp7mivv2bdwcmqjnwrmv9pg99jk73cw9bgyq00n"))))
     (build-system cmake-build-system)
     (arguments
      `(#:tests? #f                      ;No test
-- 
2.33.1