GNU bug report logs - #38849
Fix IBus-Rime

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 38849 in the body.
You can then email your comments to 38849 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: kanichos <at> yandex.ru
To: guix-patches <at> gnu.org
Subject: Fix IBus-Rime
Date: Wed, 01 Jan 2020 13:28:28 +0300

IBus uses the component file rime.xml to start the Rime engine. It must be patched with appropriate paths.

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

diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 42a8d5db32..7daefde021 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -668,6 +668,10 @@ Method Engine.")
                                (assoc-ref inputs "rime-data")
                                "/share/rime-data\"\n")))
              #t))
+         (add-after 'unpack 'fix-paths
+           (lambda* (#:key outputs #:allow-other-keys)
+             (substitute* "rime.xml"
+               (("/usr") (assoc-ref outputs "out"))) #t))
          (delete 'configure))))
     (inputs
      `(("gdk-pixbuf" ,gdk-pixbuf)
-- 
2.23.0

Message #10 received at 38849-done <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: kanichos <at> yandex.ru
Cc: 38849-done <at> debbugs.gnu.org
Subject: Re: [bug#38849] Fix IBus-Rime
Date: Mon, 06 Jan 2020 15:26:54 +0100

Hello,

kanichos <at> yandex.ru skribis:

> IBus uses the component file rime.xml to start the Rime engine. It must be patched with appropriate paths.
>
> ---
>  gnu/packages/ibus.scm | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
> index 42a8d5db32..7daefde021 100644
> --- a/gnu/packages/ibus.scm
> +++ b/gnu/packages/ibus.scm
> @@ -668,6 +668,10 @@ Method Engine.")
>                                 (assoc-ref inputs "rime-data")
>                                 "/share/rime-data\"\n")))
>               #t))
> +         (add-after 'unpack 'fix-paths
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (substitute* "rime.xml"
> +               (("/usr") (assoc-ref outputs "out"))) #t))

I made the following changes:

  1. Move the explanation as a comment in the code.

  2. Write “file name” instead of “path”, for consistency.

  3. Write a commit log that follows the project’s conventions.

Committed now, thank you!

Ludo’.

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.