From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:8:6d80::]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id UOe2NOMyeGDRawAAgWs5BA (envelope-from ) for ; Thu, 15 Apr 2021 14:34:43 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id uN+TLuMyeGChCAAAbx9fmQ (envelope-from ) for ; Thu, 15 Apr 2021 12:34: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 9216E28F02 for ; Thu, 15 Apr 2021 14:34:43 +0200 (CEST) Received: from localhost ([::1]:43412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lX1Ck-0001Ri-7v for larch@yhetil.org; Thu, 15 Apr 2021 08:34:42 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47010) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lX18G-0005vZ-Q3 for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:07 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53362) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lX18E-0007cG-Un for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lX18E-0007X5-R5 for guix-patches@gnu.org; Thu, 15 Apr 2021 08:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47770] [PATCH core-updates v2 2/5] gnu: ibus: Enable documentation. Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 15 Apr 2021 12:30:02 +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.161848977228817 (code B ref 47770); Thu, 15 Apr 2021 12:30:02 +0000 Received: (at 47770) by debbugs.gnu.org; 15 Apr 2021 12:29:32 +0000 Received: from localhost ([127.0.0.1]:36657 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17j-0007Uj-B2 for submit@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:31 -0400 Received: from out2.migadu.com ([188.165.223.204]:51860) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lX17g-0007UZ-Lc for 47770@debbugs.gnu.org; Thu, 15 Apr 2021 08:29:29 -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=1618489766; 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=87CROTeJU+RTLMoygpyE8a5xMgDL13TEevJXbryj5P8=; b=dXc1HoBE5a4RzgGr5zpYMwmMnzs+7PEgGZ1YwkRFI13ssVqb8saT4zkE/4Gbw/3+mzbfhw O3E+K/0i+aLQUHIMuqQTSHf81GfzChy9+PTZjblkKdaGhFuogu9sVAouQ0rcXmQCVQxeF3 MB5Ll2wkbty7u+5dQNWRbB4+es0zYpy256H3+iL7j0W52zL5TiC0SVcMjnTod0B2Y1Bgee 0XZV9FPxvAuD2gu7EZPom3vvW7Yodvxhs7A+3iud4I0FdppsxU/5uKNmCF4Dfz7ndKjfO6 r5uaNHZuLWQZZinlBuo9flge7UNjRJDbZWKl+KrS68TdQtOT01ofI3KsysIUOw== Date: Thu, 15 Apr 2021 08:28:59 -0400 Message-Id: <20210415122902.2608-2-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: 9216E28F02 X-Spam-Score: -4.00 X-Migadu-Scanner: scn0.migadu.com X-TUID: XTbwEN8Nbwyv * gnu/packages/ibus.scm (ibus)[outputs](doc): New output. [configure-flags](enable-gtk-doc): New flag. [phases](patch-docbook-xml): New phase. (move-doc): New phase. [native-inputs]: Add docbook-xml and gtk-doc. --- gnu/packages/ibus.scm | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm index e566993b08..b6687239df 100644 --- a/gnu/packages/ibus.scm +++ b/gnu/packages/ibus.scm @@ -42,6 +42,7 @@ #:use-module (gnu packages databases) #:use-module (gnu packages datastructures) #:use-module (gnu packages dbm) + #:use-module (gnu packages docbook) #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) @@ -73,10 +74,12 @@ (base32 "07s2ly75xv50bqg37mn37i9akqvcfd45k2mbplxrsqk3a2b3mwxb")))) (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) (arguments `(#:tests? #f ; tests fail because there's no connection to dbus #:parallel-build? #f ; race condition discovered with emoji support #:configure-flags (list "--enable-python-library" + "--enable-gtk-doc" (string-append "--with-unicode-emoji-dir=" (assoc-ref %build-inputs "unicode-emoji") @@ -91,6 +94,14 @@ "--enable-wayland") #: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)) (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)) + (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))) (add-after 'wrap-program 'wrap-with-additional-paths (lambda* (#:key outputs #:allow-other-keys) ;; Make sure 'ibus-setup' runs with the correct PYTHONPATH and @@ -160,10 +180,12 @@ ("wayland" ,wayland) ("xmodmap" ,xmodmap))) (native-inputs - `(("glib" ,glib "bin") ; for glib-genmarshal + `(("docbook-xml" ,docbook-xml-4.1.2) + ("glib" ,glib "bin") ; for glib-genmarshal ("gettext" ,gettext-minimal) ("gnome-common" ,gnome-common) ("gobject-introspection" ,gobject-introspection) ; for g-ir-compiler + ("gtk-doc" ,gtk-doc) ("perl" ,perl) ("pkg-config" ,pkg-config) ("python-wrapper" ,python-wrapper) -- 2.31.1