From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id uOe7Nf9cd2DlkAAAgWs5BA (envelope-from ) for ; Wed, 14 Apr 2021 23:22:07 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id +GOSL/9cd2AfGQAA1q6Kng (envelope-from ) for ; Wed, 14 Apr 2021 21:22:07 +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 964EF12359 for ; Wed, 14 Apr 2021 23:22:07 +0200 (CEST) Received: from localhost ([::1]:35202 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWmxa-00050Q-NJ for larch@yhetil.org; Wed, 14 Apr 2021 17:22:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50770) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWmxW-00050F-5e for guix-patches@gnu.org; Wed, 14 Apr 2021 17:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:52591) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWmxV-0000cF-Sp for guix-patches@gnu.org; Wed, 14 Apr 2021 17:22:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWmxV-0001Hp-M6 for guix-patches@gnu.org; Wed, 14 Apr 2021 17:22:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates 2/4] gnu: ibus: Enable documentation. Resent-From: Maxime Devos Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 21:22:01 +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: Raghav Gururajan , 47770@debbugs.gnu.org Received: via spool by 47770-submit@debbugs.gnu.org id=B47770.16184353184934 (code B ref 47770); Wed, 14 Apr 2021 21:22:01 +0000 Received: (at 47770) by debbugs.gnu.org; 14 Apr 2021 21:21:58 +0000 Received: from localhost ([127.0.0.1]:35904 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWmxR-0001HW-Tf for submit@debbugs.gnu.org; Wed, 14 Apr 2021 17:21:58 -0400 Received: from albert.telenet-ops.be ([195.130.137.90]:37214) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWmxO-0001HJ-MS for 47770@debbugs.gnu.org; Wed, 14 Apr 2021 17:21:56 -0400 Received: from ptr-bvsjgyjmffd7q9timvx.18120a2.ip6.access.telenet.be ([IPv6:2a02:1811:8c09:9d00:aaf1:9810:a0b8:a55d]) by albert.telenet-ops.be with bizsmtp id slMs240060mfAB406lMt3o; Wed, 14 Apr 2021 23:21:53 +0200 Message-ID: <45ef6247d0c39df7be8e0fce23d9b608921c12f5.camel@telenet.be> From: Maxime Devos Date: Wed, 14 Apr 2021 23:21:44 +0200 In-Reply-To: <20210414115349.14040-2-rg@raghavgururajan.name> References: <20210414115349.14040-1-rg@raghavgururajan.name> <20210414115349.14040-2-rg@raghavgururajan.name> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-fsrrnQ+k8XosMH9A1fqG" User-Agent: Evolution 3.34.2 MIME-Version: 1.0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=telenet.be; s=r21; t=1618435313; bh=KwdjXLfVojXxou7li1v9WkgTDwC3Cr9BsYpYzGD89YU=; h=Subject:From:To:Date:In-Reply-To:References; b=Y1YNKTZQC4+8Ngv0hBfF5Pr1NmPejQh+fbIYcLMCPghK//Frl5sL6cM+qGwB4TuZd seqUBEutrVCK07qmQLqcjWZJEsCgk/TZeQcWEH6HDe3XTO2muxWSsHI+YVAlsJG0n+ yM7BqUmBYMbe4KB+rbGwN8XQ+R3akmR1FsD/+qdrP4RKZpAON7SsmuPpzLvDZAuxeC qtj0FTBqBtk1xXuzlHkj8/GeMtHvoJjLuyDbTM7hcjpinBDgwFnQevLyGeUBBGy/sY w0adHDeNbjiQ8Lud9/72YW4DNcQ/cPO4QVKWYSu1bWY3xtC7qeluZSFHYJU+jSZzFK G3BkwH5MK0ZIQ== 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" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -4.00 Authentication-Results: aspmx1.migadu.com; none X-Migadu-Queue-Id: 964EF12359 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: DrYOTMYOyuKd --=-fsrrnQ+k8XosMH9A1fqG Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, 2021-04-14 at 07:53 -0400, Raghav Gururajan via Guix-patches via wr= ote: > #:phases > (modify-phases %standard-phases > + (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)) Letting a phase return #t isn't required anymore, and the warning has been removed on core-updates (which this patch series is targetting. The #t can be dropped now. > (add-after 'unpack 'patch-python-target-directories > (lambda* (#:key outputs #:allow-other-keys) > (let ((root (string-append (assoc-ref outputs "out") > @@ -127,6 +138,15 @@ > (("\"(setxkbmap|xmodmap)\"" _ prog) > (string-append "\"" (assoc-ref inputs prog) "/bin/" prog= "\""))) > #t)) While you're modifying the package anyway, you might as well drop this one = too. > + (add-after 'install 'move-doc > + (lambda* (#:key outputs #:allow-other-keys) > + (let* ((out (assoc-ref outputs "out")) > + (doc (assoc-ref outputs "doc"))) > + (mkdir-p (string-append doc "/share")) > + (rename-file > + (string-append out "/share/gtk-doc") > + (string-append doc "/share/gtk-doc")) > + #t))) Likewise. Warning: I didn't test this patch series. Greetings, Maxime. --=-fsrrnQ+k8XosMH9A1fqG Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part Content-Transfer-Encoding: 7bit -----BEGIN PGP SIGNATURE----- iI0EABYKADUWIQTB8z7iDFKP233XAR9J4+4iGRcl7gUCYHdc6BccbWF4aW1lZGV2 b3NAdGVsZW5ldC5iZQAKCRBJ4+4iGRcl7haoAQDKmCyPWhWpqEc8wIYQsD5qEnPo qtp2RbFDvdl8wpDkAQEA2+xZ7fVIB3qS9V9hVdZe/QP14Dw4KB3dGzAgDjxD+wE= =zzFE -----END PGP SIGNATURE----- --=-fsrrnQ+k8XosMH9A1fqG--