From patchwork Thu Jun 30 20:15:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alice BRENON X-Patchwork-Id: 40444 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id A1F4627BBEA; Thu, 30 Jun 2022 21:16:12 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 603AE27BBE9 for ; Thu, 30 Jun 2022 21:16:12 +0100 (BST) Received: from localhost ([::1]:37286 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1o70aB-0006m1-Gf for patchwork@mira.cbaines.net; Thu, 30 Jun 2022 16:16:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34896) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1o70a2-0006l5-OJ for guix-patches@gnu.org; Thu, 30 Jun 2022 16:16:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:41783) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1o70a2-00065n-GH for guix-patches@gnu.org; Thu, 30 Jun 2022 16:16:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1o70a2-00009k-Ci for guix-patches@gnu.org; Thu, 30 Jun 2022 16:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#52576] [PATCH] gnu: ibus-anthy: Update to 1.15.12 Resent-From: Alice BRENON Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 30 Jun 2022 20:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 52576 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Maxim Cournoyer Cc: 52576@debbugs.gnu.org, Taiju HIGASHI Received: via spool by 52576-submit@debbugs.gnu.org id=B52576.1656620155577 (code B ref 52576); Thu, 30 Jun 2022 20:16:02 +0000 Received: (at 52576) by debbugs.gnu.org; 30 Jun 2022 20:15:55 +0000 Received: from localhost ([127.0.0.1]:35680 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o70Zv-00009E-D4 for submit@debbugs.gnu.org; Thu, 30 Jun 2022 16:15:55 -0400 Received: from lxc-smtp2.ens-lyon.fr ([140.77.167.81]:58746) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1o70Zp-00008y-R7 for 52576@debbugs.gnu.org; Thu, 30 Jun 2022 16:15:53 -0400 Received: from localhost (localhost [127.0.0.1]) by lxc-smtp2.ens-lyon.fr (Postfix) with ESMTP id 41F6AE665F; Thu, 30 Jun 2022 22:15:48 +0200 (CEST) X-Virus-Scanned: by amavisd-new-2.11.0 (20160426) (Debian) at ens-lyon.fr Received: from lxc-smtp2.ens-lyon.fr ([127.0.0.1]) by localhost (lxc-smtp2.ens-lyon.fr [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id U2ijGKXP6wqq; Thu, 30 Jun 2022 22:15:48 +0200 (CEST) Received: from localhost (unknown [78.194.167.103]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (Client did not present a certificate) by lxc-smtp2.ens-lyon.fr (Postfix) with ESMTPSA id F19E6E66AB; Thu, 30 Jun 2022 22:15:47 +0200 (CEST) Date: Thu, 30 Jun 2022 22:15:47 +0200 From: Alice BRENON Message-ID: <20220630221547.3ba3cee3@ens-lyon.fr> In-Reply-To: <83F454AE-32A5-41B1-A5E5-11B585979656@gmail.com> References: <20211217134028.29117-1-higashi@taiju.info> <20220628104304.7734d32e@ens-lyon.fr> <878rpfetud.fsf@taiju.info> <8735fnizxj.fsf@taiju.info> <20220629154634.1af99013@ens-lyon.fr> <875ykjpnrp.fsf@taiju.info> <87zghvo8le.fsf@taiju.info> <20220629163504.73131f8a@ens-lyon.fr> <83F454AE-32A5-41B1-A5E5-11B585979656@gmail.com> Organization: ENS de Lyon X-Mailer: Claws Mail 4.1.0 (GTK 3.24.30; x86_64-pc-linux-gnu) MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Alright, thanks for the last missing piece of the puzzle. Here is a fix hopefully not too different from the one you'd have written. If everyone agrees on it, I think someone with commit rights could merge it on master even before you come back closer to a proper keyboard to avoid more users hitting the problem. And, in any case, before this happens there's the quickfix I suggested above : ) Cheers, Alice Le Wed, 29 Jun 2022 22:25:24 -0400, Maxim Cournoyer a écrit : > On June 29, 2022 10:35:04 AM EDT, Alice BRENON > wrote: > > [...] > > >And now all I want to know is if we can revert `inputs` back to > >`outputs` or if there is a good reason not to do so, and hence what > >should be done in that case, but it seems that it is a matter on > >which Maxim Cournoyer has the expertise, since he was the one to > >introduce the change. > > [...] > > Seems an oversight on my part, apologies! 'inputs' in > > + ,(search-input-directory > + inputs "lib/girepository-1.0"))))) > > Should have been 'outputs'. Unfortunately I'm nowhere near a > keyboard for a week, so won't be able to commit the trivial fix in > that time. > > Thanks, > > Maxim > > Hi, From e851ab2c68cb2fab26bf686d56fdb1488ef9e78d Mon Sep 17 00:00:00 2001 From: Alice BRENON Date: Thu, 30 Jun 2022 22:02:22 +0200 Subject: [PATCH] gnu: ibus-anthy: Fix wrapped programs This is in follow up to 89db6e7ec77bf0f33474e47945755f5ab45e9f06, the proper fix wasn't to add inputs to the arguments but to use outputs to set the GI_TYPELIB_PATH. * gnu/packages/ibus.scm (ibus-anthy) [phase]{wrap-programs}: Search within outputs instead of inputs to set GI_TYPELIB_PATH. --- gnu/packages/ibus.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index 234d4bd75f..9e8b0f124b 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -329,7 +329,7 @@ (define-public ibus-anthy #:phases (modify-phases %standard-phases (add-after 'install 'wrap-programs - (lambda* (#:key inputs outputs #:allow-other-keys) + (lambda* (#:key outputs #:allow-other-keys) (for-each (lambda (prog) (wrap-program (search-input-file outputs (string-append "libexec/" prog)) @@ -338,7 +338,7 @@ (define-public ibus-anthy `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH") ,(search-input-directory - inputs "lib/girepository-1.0"))))) + outputs "lib/girepository-1.0"))))) '("ibus-engine-anthy" "ibus-setup-anthy"))))))) (native-inputs (list gettext-minimal -- 2.36.1