unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#51667] [PATCH] Several patches about fcitx5
@ 2021-11-07 14:41 dan
  2021-11-10 13:04 ` 宋文武
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: dan @ 2021-11-07 14:41 UTC (permalink / raw)
  To: 51667


[-- 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


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* [bug#51667] [PATCH] Several patches about fcitx5
  2021-11-07 14:41 [bug#51667] [PATCH] Several patches about fcitx5 dan
@ 2021-11-10 13:04 ` 宋文武
  2021-11-10 17:54 ` [bug#51667] [PATCH] gnu: Add fcitx5-rime dan
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: 宋文武 @ 2021-11-10 13:04 UTC (permalink / raw)
  To: dan; +Cc: 51667

dan <igaryhe@gmail.com> writes:

> 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

Thank you!  I had pushed 0003 to 0006 patches.

>
> This is my first time submitting patches, if there is anything wrong please let me know.
>
> 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.

Here missing the description for files modifications, eg:
```
* gnu/packages/fcitx5.scm (fcitx5-rime): New variable.
```
>
> ---
>  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)))
When use 'git-fetch', we will usually set 'file-name' too:
```
(file-name (git-file-name name version)
```
Otherwise, the source directory in store will be unnamed '....-checkout'.

> +       (sha256
> +        (base32
> +         "17fi36m70d8gwwyragms4rl7xjx4k7g5ixs8rcj8r2ph1ak9ymhy"))))
> +    (build-system cmake-build-system)
> +    (arguments
> +     `(#:tests? #f
When disable tests, we should leave a comment, eg: '; no tests'.

Also, when the arguments value doesn't use unquote (,), I think it's
better to use quote ('), not quasiquote (`) here.

> +       #:configure-flags
> +       (list (string-append "-DRIME_DATA_DIR="
> +			    (assoc-ref %build-inputs "rime-data")
> +			    "/share/rime-data"))))
> +    (inputs
> +     `(("gettext", gettext-minimal)
In most cases "gettext" should be a native input, we can check the
result via "./pre-inst-env guix size fcitx5-rime", if "gettext" is not
in the output list, then it means "gettext" is only used at build time
(for envsubst, msgfmt, etc.), not runtime (maybe linked to
libgettextlib.so), thus should be a native input.

> +       ("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")
Like other packages in fcitx5.scm, we should use "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.")

We use 2 spaces between sentences, eg: "... Chinese dialects.  It has ...".
> +    (license license:lgpl2.1+)))
> -- 
> 2.33.1
>
>
>
>
>
> 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")))))

Hello, just curious, what fcitx5 will search in XDG_DATA_DIRS?

>      (home-page "https://github.com/fcitx/fcitx5")
>      (synopsis "Input method framework")
>      (description "Fcitx 5 is a generic input method framework.")


Hope this helps, thank you!




^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#51667] [PATCH] gnu: Add fcitx5-rime.
  2021-11-07 14:41 [bug#51667] [PATCH] Several patches about fcitx5 dan
  2021-11-10 13:04 ` 宋文武
@ 2021-11-10 17:54 ` dan
  2021-11-10 18:04 ` dan
  2022-11-06 20:52 ` bug#51667: dan
  3 siblings, 0 replies; 5+ messages in thread
From: dan @ 2021-11-10 17:54 UTC (permalink / raw)
  To: 51667

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

From 2f8fef92b3fce1cfec7244e1bdca7e63f52b8a6c Mon Sep 17 00:00:00 2001
From: dan <igaryhe@gmail.com>
Date: Sun, 7 Nov 2021 21:57:24 +0800
Subject: [PATCH] gnu: Add fcitx5-rime.

* gnu/packages/fcitx5.scm (fcitx5-rime): New variable.
---
 gnu/packages/fcitx5.scm | 47 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scmindex
0c4980aba2..27c28d56e1 100644--- a/gnu/packages/fcitx5.scm+++
b/gnu/packages/fcitx5.scm@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>+;;;
Copyright © 2021 dan <igaryhe@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;@@ -47,7 +48,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@@ -139,7 +141,11 @@ (define-public fcitx5
     (native-search-paths
      (list (search-path-specification
             (variable "FCITX_ADDON_DIRS")-            (files
'("lib/fcitx5")))))+            (files '("lib/fcitx5")))+           ;
export XDG_DATA_DIRS so that fcitx5 could search other addons+
  (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.")@@
-453,3 +459,40 @@ (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 url-fetch)+       (uri (string-append+
     "https://download.fcitx-im.org/fcitx5"+
"/fcitx5-rime/fcitx5-rime-" version ".tar.xz"))+       (sha256+
(base32 "0rl8ng11jprzi3lvx3jdim5b5y8k31l14jgjricxzw5i3fvfqzp3"))))+
(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"))))+    (inputs+
`(("fcitx5", fcitx5)+       ("librime", librime)+       ("rime-data",
rime-data)))+    (native-inputs+     `(("gettext", gettext-minimal)+
    ("extra-cmake-modules", extra-cmake-modules)+       ("pkg-config",
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.33.1

[-- Attachment #2: Type: text/html, Size: 4915 bytes --]

^ permalink raw reply	[flat|nested] 5+ messages in thread

* [bug#51667] [PATCH] gnu: Add fcitx5-rime.
  2021-11-07 14:41 [bug#51667] [PATCH] Several patches about fcitx5 dan
  2021-11-10 13:04 ` 宋文武
  2021-11-10 17:54 ` [bug#51667] [PATCH] gnu: Add fcitx5-rime dan
@ 2021-11-10 18:04 ` dan
  2022-11-06 20:52 ` bug#51667: dan
  3 siblings, 0 replies; 5+ messages in thread
From: dan @ 2021-11-10 18:04 UTC (permalink / raw)
  To: 51667


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



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

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

From 2f8fef92b3fce1cfec7244e1bdca7e63f52b8a6c Mon Sep 17 00:00:00 2001
From: dan <igaryhe@gmail.com>
Date: Sun, 7 Nov 2021 21:57:24 +0800
Subject: [PATCH] gnu: Add fcitx5-rime.

* gnu/packages/fcitx5.scm (fcitx5-rime): New variable.

---
 gnu/packages/fcitx5.scm | 47 +++++++++++++++++++++++++++++++++++++++--
 1 file changed, 45 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/fcitx5.scm b/gnu/packages/fcitx5.scm
index 0c4980aba2..27c28d56e1 100644
--- a/gnu/packages/fcitx5.scm
+++ b/gnu/packages/fcitx5.scm
@@ -1,6 +1,7 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2020 Zhu Zihao <all_but_last@163.com>
 ;;; Copyright © 2021 Tobias Geerinckx-Rice <me@tobias.gr>
+;;; Copyright © 2021 dan <igaryhe@gmail.com>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -47,7 +48,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
@@ -139,7 +141,11 @@ (define-public fcitx5
     (native-search-paths
      (list (search-path-specification
             (variable "FCITX_ADDON_DIRS")
-            (files '("lib/fcitx5")))))
+            (files '("lib/fcitx5")))
+           ; export XDG_DATA_DIRS so that fcitx5 could search other addons
+           (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.")
@@ -453,3 +459,40 @@ (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 url-fetch)
+       (uri (string-append
+             "https://download.fcitx-im.org/fcitx5"
+             "/fcitx5-rime/fcitx5-rime-" version ".tar.xz"))
+       (sha256
+        (base32 "0rl8ng11jprzi3lvx3jdim5b5y8k31l14jgjricxzw5i3fvfqzp3"))))
+    (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"))))
+    (inputs
+     `(("fcitx5", fcitx5)
+       ("librime", librime)
+       ("rime-data", rime-data)))
+    (native-inputs
+     `(("gettext", gettext-minimal)
+       ("extra-cmake-modules", extra-cmake-modules)
+       ("pkg-config", 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.33.1


^ permalink raw reply related	[flat|nested] 5+ messages in thread

* bug#51667:
  2021-11-07 14:41 [bug#51667] [PATCH] Several patches about fcitx5 dan
                   ` (2 preceding siblings ...)
  2021-11-10 18:04 ` dan
@ 2022-11-06 20:52 ` dan
  3 siblings, 0 replies; 5+ messages in thread
From: dan @ 2022-11-06 20:52 UTC (permalink / raw)
  To: 51667-done

close in favor of #59084




^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2022-11-06 20:53 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-11-07 14:41 [bug#51667] [PATCH] Several patches about fcitx5 dan
2021-11-10 13:04 ` 宋文武
2021-11-10 17:54 ` [bug#51667] [PATCH] gnu: Add fcitx5-rime dan
2021-11-10 18:04 ` dan
2022-11-06 20:52 ` bug#51667: dan

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).