From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id aFBQFR8zeGByaQAAgWs5BA (envelope-from ) for ; Thu, 15 Apr 2021 14:35:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id YHkhDx8zeGAjHwAAB5/wlQ (envelope-from ) for ; Thu, 15 Apr 2021 12:35:43 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id F177E1FD1A for ; Thu, 15 Apr 2021 14:35:42 +0200 (CEST) Received: from localhost ([::1]:45686 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lX1Di-0002Tc-1F for larch@yhetil.org; Thu, 15 Apr 2021 08:35:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47018) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lX18H-0005vh-6O for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53366) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lX18G-0007dE-Ud for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lX18G-0007Xa-Ml for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates v2 5/5] gnu: ibus: Remove trailing #t in phases. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Apr 2021 12:30:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47770 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47770@debbugs.gnu.org Cc: Raghav Gururajan Received: via spool by 47770-submit@debbugs.gnu.org id=B47770.161848977928878 (code B ref 47770); Thu, 15 Apr 2021 12:30:04 +0000 Received: (at 47770) by debbugs.gnu.org; 15 Apr 2021 12:29:39 +0000 Received: from localhost ([127.0.0.1]:36671 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17q-0007Vc-Rm for submit@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:39 -0400 Received: from out2.migadu.com ([188.165.223.204]:51886) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17o-0007VL-07 for 47770@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:36 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raghavgururajan.name; s=key1; t=1618489774; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=N9hHFEZ65x3Aefp/zIisbMIcgiD3uvE1Kqx55um+mns=; b=lPobvuQWXpDlA1kl3J9h9xwph6g085HvJnAGYDpaeRNh2WTIke1mOSEmErG9JQ6z5FcEN/ finHc4UQ7nMH9PkhMsVj1qGwLnP5UkpaTiHowg9XohRYoMQhvh4Zs69AXranSyOJTFG+Gn R7ZD/6KqDn4rA4ixPDgFxsBB853rm9KpAICFbUbzmG4kShLKNKoFXAcZmUD5ZgV3CDbK9V MJ2RRvZ/9XGWul2SMdGfgYoU8Vv5SR/lsRwougPYaBKVZqNijvdoiaXwuJvG4nUqE2SDEA yjOX9TeXmtmNqb9ThSxc+TM6gj59wOeQyWFnxyClgh774my6yZLaWx3yWd2K2w== Date: Thu, 15 Apr 2021 08:29:02 -0400 Message-Id: <20210415122902.2608-5-rg@raghavgururajan.name> In-Reply-To: <20210415122902.2608-1-rg@raghavgururajan.name> References: <20210415122902.2608-1-rg@raghavgururajan.name> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Auth-User: rg@raghavgururajan.name 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" Reply-to: Raghav Gururajan X-ACL-Warn: , Raghav Gururajan via Guix-patches From: Raghav Gururajan via Guix-patches via X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: F177E1FD1A X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: A+0n1hmwibPC * gnu/packages/ibus.scm (ibus)[phases]: Remove trailing #t. --- gnu/packages/ibus.scm | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index fa12499bb9..cdd4708d22 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -100,16 +100,14 @@ (with-directory-excursion "src/tests" (substitute* '("ibus-share.c" "ibus-compose.c" "ibus-keypress.c") - (("[ \t]*return g_test_run \\(\\);") ""))) - #t)) + (("[ \t]*return g_test_run \\(\\);") ""))))) (add-after 'unpack 'patch-docbook-xml (lambda* (#:key inputs #:allow-other-keys) (with-directory-excursion "docs/reference/ibus" (substitute* "ibus-docs.sgml.in" (("http://www.oasis-open.org/docbook/xml/4.1.2/") (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/")))) - #t)) + "/xml/dtd/docbook/")))))) (add-after 'unpack 'patch-python-target-directories (lambda* (#:key outputs #:allow-other-keys) (let ((root (string-append (assoc-ref outputs "out") @@ -120,13 +118,11 @@ (("(py2?overridesdir)=.*" _ var) (string-append var "=" root "/gi/overrides/")) (("(pkgpython2dir=).*" _ var) - (string-append var root "/ibus")))) - #t)) + (string-append var root "/ibus")))))) (add-before 'configure 'disable-dconf-update (lambda _ (substitute* "data/dconf/Makefile.in" - (("dconf update") "echo dconf update")) - #t)) + (("dconf update") "echo dconf update")))) (add-after 'unpack 'delete-generated-files (lambda _ (for-each (lambda (file) @@ -134,8 +130,7 @@ (when (file-exists? c) (format #t "deleting ~a\n" c) (delete-file c)))) - (find-files "." "\\.vala")) - #t)) + (find-files "." "\\.vala")))) (add-after 'unpack 'fix-paths (lambda* (#:key inputs #:allow-other-keys) (substitute* "src/ibusenginesimple.c" @@ -144,8 +139,7 @@ "/share/X11/locale"))) (substitute* "ui/gtk3/xkblayout.vala" (("\"(setxkbmap|xmodmap)\"" _ prog) - (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\""))) - #t)) + (string-append "\"" (assoc-ref inputs prog) "/bin/" prog "\""))))) (add-before 'check 'pre-check (lambda _ ;; Tests write to $HOME. @@ -158,8 +152,7 @@ (system "Xvfb :1 +extension GLX &") (setenv "DISPLAY" ":1") ;; Tests require running iBus daemon. - (system "./bus/ibus-daemon --daemonize") - #t)) + (system "./bus/ibus-daemon --daemonize"))) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) @@ -167,8 +160,7 @@ (mkdir-p (string-append doc "/share")) (rename-file (string-append out "/share/gtk-doc") - (string-append doc "/share/gtk-doc")) - #t))) + (string-append doc "/share/gtk-doc"))))) (add-after 'wrap-program 'wrap-with-additional-paths (lambda* (#:key outputs #:allow-other-keys) ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and @@ -178,8 +170,7 @@ `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH") - ,(string-append out "/lib/girepository-1.0"))))) - #t))))) + ,(string-append out "/lib/girepository-1.0")))))))))) (inputs `(("dbus" ,dbus) ("dconf" ,dconf) -- 2.31.1