From patchwork Fri Nov 9 18:20:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 156 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 9D887167E7; Fri, 9 Nov 2018 18:21:19 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 64628167E5 for ; Fri, 9 Nov 2018 18:21:19 +0000 (GMT) Received: from localhost ([::1]:35499 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLBPC-0000Eq-L1 for patchwork@mira.cbaines.net; Fri, 09 Nov 2018 13:21:18 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49629) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLBP4-0000Eg-OY for guix-patches@gnu.org; Fri, 09 Nov 2018 13:21:11 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLBOz-00080Y-Mc for guix-patches@gnu.org; Fri, 09 Nov 2018 13:21:10 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39682) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gLBOw-0007tD-A3 for guix-patches@gnu.org; Fri, 09 Nov 2018 13:21:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gLBOw-0005hL-4z for guix-patches@gnu.org; Fri, 09 Nov 2018 13:21:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33327] [PATCH 1/2] gnu: gtk-doc: Use local docbook-xsl. Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Nov 2018 18:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 33327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33327@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.154178763321846 (code B ref -1); Fri, 09 Nov 2018 18:21:01 +0000 Received: (at submit) by debbugs.gnu.org; 9 Nov 2018 18:20:33 +0000 Received: from localhost ([127.0.0.1]:43940 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gLBOS-0005gI-Pp for submit@debbugs.gnu.org; Fri, 09 Nov 2018 13:20:32 -0500 Received: from eggs.gnu.org ([208.118.235.92]:39921) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gLBOQ-0005g5-Uj for submit@debbugs.gnu.org; Fri, 09 Nov 2018 13:20:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLBOJ-0006ia-RF for submit@debbugs.gnu.org; Fri, 09 Nov 2018 13:20:25 -0500 Received: from lists.gnu.org ([2001:4830:134:3::11]:36203) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gLBOJ-0006iL-3g for submit@debbugs.gnu.org; Fri, 09 Nov 2018 13:20:23 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:49523) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLBOI-0007n4-2q for guix-patches@gnu.org; Fri, 09 Nov 2018 13:20:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLBOD-0006gg-1o for guix-patches@gnu.org; Fri, 09 Nov 2018 13:20:22 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:45051) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gLBOC-0006g5-7e for guix-patches@gnu.org; Fri, 09 Nov 2018 13:20:16 -0500 X-Originating-IP: 86.246.35.59 Received: from mimimi.home (lfbn-1-799-59.w86-246.abo.wanadoo.fr [86.246.35.59]) (Authenticated sender: mail@ambrevar.xyz) by relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 85070E0009 for ; Fri, 9 Nov 2018 18:20:13 +0000 (UTC) From: Pierre Neidhardt Date: Fri, 9 Nov 2018 19:20:13 +0100 Message-Id: <20181109182013.20661-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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 * gnu/packages/gtk.scm (gtk-doc): Use local docbook-xsl. --- gnu/packages/gtk.scm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 640bd75da..0d62b8083 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -19,6 +19,7 @@ ;;; Copyright © 2017 Marius Bakke ;;; Copyright © 2018 Alex Vong ;;; Copyright © 2018 Arun Isaac +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -1411,7 +1412,12 @@ information.") (string-append (assoc-ref inputs "docbook-xsl") "/xml/xsl/docbook-xsl-" ,(package-version docbook-xsl) - "/html/chunk.xsl"))) + "/html/chunk.xsl")) + (("http://docbook.sourceforge.net/release/xsl/current/common/en.xml") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/common/en.xml"))) #t)) (add-after 'patch-gtk-doc-scan 'patch-test-out (lambda _ From patchwork Fri Nov 9 18:24:43 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Pierre Neidhardt X-Patchwork-Id: 157 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 7BA6B167E7; Fri, 9 Nov 2018 18:25:15 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) by mira.cbaines.net (Postfix) with ESMTPS id 22C8C167E5 for ; Fri, 9 Nov 2018 18:25:15 +0000 (GMT) Received: from localhost ([::1]:35508 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLBT0-0005Bj-GL for patchwork@mira.cbaines.net; Fri, 09 Nov 2018 13:25:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:50868) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gLBSt-0005B3-6e for guix-patches@gnu.org; Fri, 09 Nov 2018 13:25:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gLBSo-00034Z-9r for guix-patches@gnu.org; Fri, 09 Nov 2018 13:25:06 -0500 Received: from debbugs.gnu.org ([208.118.235.43]:39689) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gLBSo-00034J-5T for guix-patches@gnu.org; Fri, 09 Nov 2018 13:25:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gLBSo-0005nd-0w for guix-patches@gnu.org; Fri, 09 Nov 2018 13:25:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#33327] [PATCH 2/2] gnu: webkitgtk: Include documentation. References: <20181109182013.20661-1-mail@ambrevar.xyz> In-Reply-To: <20181109182013.20661-1-mail@ambrevar.xyz> Resent-From: Pierre Neidhardt Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 09 Nov 2018 18:25:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33327 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 33327@debbugs.gnu.org Received: via spool by 33327-submit@debbugs.gnu.org id=B33327.154178788822269 (code B ref 33327); Fri, 09 Nov 2018 18:25:01 +0000 Received: (at 33327) by debbugs.gnu.org; 9 Nov 2018 18:24:48 +0000 Received: from localhost ([127.0.0.1]:43947 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gLBSa-0005n7-CE for submit@debbugs.gnu.org; Fri, 09 Nov 2018 13:24:48 -0500 Received: from relay5-d.mail.gandi.net ([217.70.183.197]:44271) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gLBSY-0005my-1g for 33327@debbugs.gnu.org; Fri, 09 Nov 2018 13:24:46 -0500 X-Originating-IP: 86.246.35.59 Received: from mimimi.home (lfbn-1-799-59.w86-246.abo.wanadoo.fr [86.246.35.59]) (Authenticated sender: mail@ambrevar.xyz) by relay5-d.mail.gandi.net (Postfix) with ESMTPSA id D00891C0002 for <33327@debbugs.gnu.org>; Fri, 9 Nov 2018 18:24:44 +0000 (UTC) From: Pierre Neidhardt Date: Fri, 9 Nov 2018 19:24:43 +0100 Message-Id: <20181109182443.22490-1-mail@ambrevar.xyz> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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 * gnu/packages/webkit.scm (webkitgtk): Include documentation. --- gnu/packages/webkit.scm | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index d1890c8b3..b4560c0e4 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2018 Tobias Geerinckx-Rice +;;; Copyright © 2018 Pierre Neidhardt ;;; ;;; This file is part of GNU Guix. ;;; @@ -31,6 +32,7 @@ #:use-module (gnu packages base) #:use-module (gnu packages bison) #:use-module (gnu packages databases) + #:use-module (gnu packages docbook) #:use-module (gnu packages enchant) #:use-module (gnu packages flex) #:use-module (gnu packages gcc) @@ -71,6 +73,7 @@ #:build-type "Release" ; turn off debugging symbols to save space #:configure-flags (list "-DPORT=GTK" + "-DENABLE_GTKDOC=ON" ; No doc by default (string-append ; uses lib64 by default "-DLIB_INSTALL_DIR=" (assoc-ref %outputs "out") "/lib") @@ -87,7 +90,20 @@ ;; XXX Disable WOFF2 ‘web fonts’. These were never ;; supported in our previous builds. Enabling them ;; requires building libwoff2 and possibly woff2dec. - "-DUSE_WOFF2=OFF"))) + "-DUSE_WOFF2=OFF") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-gtk-doc-scan + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "Source/WebKit/WebProcess/InjectedBundle/API/gtk/DOM/docs/webkitdomgtk-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd"))) + (substitute* "Source/WebKit/UIProcess/API/gtk/docs/webkit2gtk-docs.sgml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/docbookx.dtd"))) + #t))))) (native-inputs `(("bison" ,bison) ("gettext" ,gettext-minimal) @@ -97,6 +113,8 @@ ("perl" ,perl) ("pkg-config" ,pkg-config) ("python" ,python-2) ; incompatible with Python 3 (print syntax) + ("gtk-doc" ,gtk-doc) ; For documentation generation + ("docbook-xml" ,docbook-xml) ; For documentation generation ("ruby" ,ruby))) (propagated-inputs `(("gtk+" ,gtk+)