From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from eggs.gnu.org ([2001:470:142:3::10]:36230)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ioTMR-0005Rm-AP
 for guix-patches@gnu.org; Mon, 06 Jan 2020 09:28:04 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ioTMQ-0007Sw-C8
 for guix-patches@gnu.org; Mon, 06 Jan 2020 09:28:03 -0500
Received: from debbugs.gnu.org ([209.51.188.43]:39362)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16)
 (Exim 4.71) (envelope-from <Debian-debbugs@debbugs.gnu.org>)
 id 1ioTMQ-0007So-81
 for guix-patches@gnu.org; Mon, 06 Jan 2020 09:28:02 -0500
Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2)
 (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1ioTMQ-0006Po-4I
 for guix-patches@gnu.org; Mon, 06 Jan 2020 09:28:02 -0500
Subject: bug#38849: Fix IBus-Rime
Resent-To: guix-patches@gnu.org
Resent-Message-ID: <handler.38849.D38849.157832082624584.done@debbugs.gnu.org>
From: Ludovic =?UTF-8?Q?Court=C3=A8s?= <ludo@gnu.org>
References: <9931577874508@vla1-74bb1214b343.qloud-c.yandex.net>
Date: Mon, 06 Jan 2020 15:26:54 +0100
In-Reply-To: <9931577874508@vla1-74bb1214b343.qloud-c.yandex.net>
 (kanichos@yandex.ru's message of "Wed, 01 Jan 2020 13:28:28 +0300")
Message-ID: <87y2ukbqz5.fsf@gnu.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
List-Id: <guix-patches.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-patches>
List-Post: <mailto:guix-patches@gnu.org>
List-Help: <mailto:guix-patches-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>,
 <mailto:guix-patches-request@gnu.org?subject=subscribe>
Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org
Sender: "Guix-patches" <guix-patches-bounces+kyle=kyleam.com@gnu.org>
To: kanichos@yandex.ru
Cc: 38849-done@debbugs.gnu.org

Hello,

kanichos@yandex.ru skribis:

> IBus uses the component file rime.xml to start the Rime engine. It must b=
e 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 =E2=80=9Cfile name=E2=80=9D instead of =E2=80=9Cpath=E2=80=9D, f=
or consistency.

  3. Write a commit log that follows the project=E2=80=99s conventions.

Committed now, thank you!

Ludo=E2=80=99.