From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id QBaeGiOUbF+9IgAA0tVLHw (envelope-from ) for ; Thu, 24 Sep 2020 12:42:11 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id +EJyFiOUbF/JEwAAbx9fmQ (envelope-from ) for ; Thu, 24 Sep 2020 12:42:11 +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 BAE83940224 for ; Thu, 24 Sep 2020 12:42:10 +0000 (UTC) Received: from localhost ([::1]:39386 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kLQZc-0000vT-P7 for larch@yhetil.org; Thu, 24 Sep 2020 08:42:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57948) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kLQZW-0000vG-6K for guix-patches@gnu.org; Thu, 24 Sep 2020 08:42:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:55572) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kLQZV-0006BI-T9 for guix-patches@gnu.org; Thu, 24 Sep 2020 08:42:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kLQZV-0007J6-Qp for guix-patches@gnu.org; Thu, 24 Sep 2020 08:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42958] [PATCH core-updates 04/29] gnu: glib-with-documentation: Update, package definition. References: <20200820150914.9443-1-dannym@scratchpost.org> In-Reply-To: <20200820150914.9443-1-dannym@scratchpost.org> Resent-From: Raghav Gururajan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Sep 2020 12:42:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42958 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42958@debbugs.gnu.org Received: via spool by 42958-submit@debbugs.gnu.org id=B42958.160095131828079 (code B ref 42958); Thu, 24 Sep 2020 12:42:01 +0000 Received: (at 42958) by debbugs.gnu.org; 24 Sep 2020 12:41:58 +0000 Received: from localhost ([127.0.0.1]:38885 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQZS-0007Ip-0F for submit@debbugs.gnu.org; Thu, 24 Sep 2020 08:41:58 -0400 Received: from knopi.disroot.org ([178.21.23.139]:46562) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kLQZP-0007If-Mr for 42958@debbugs.gnu.org; Thu, 24 Sep 2020 08:41:56 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id BEAB551BD9 for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:41:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RyFB4HH8FdHv for <42958@debbugs.gnu.org>; Thu, 24 Sep 2020 14:41:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1600951312; bh=gKm9+EUEdsySViDj8pRtii9fyQEVjeW2AhYpE9rOldk=; h=To:From:Subject:Date; b=Zo0attPakR2eeBGkyMX18qE2qnsC8xM7gv/NK624b5k37fiwmTKyTsEik12oS9rPL 8Ge22Sz3DdBLXNXaLDq0QCC2WQINnymMx+9g0c77Z1ke7kpepg+cUej4u+WLAacETR pV8/cdEjpLuOFJ0FuHqYRX957D5AMqm3u+/VdIDdxvG5iahNwWv6RnZlyZAVa4AjGt c9BMCpSpRjOJJe9Yqb+ecrmIO9uPtJhklb89u+vNMPF+lOCWX6hmz8tWoykGRJBcbR 0Uhf7yqqN3zRWx/B82ZgAMq9x+iTBmxVnM5N14mAfKpgJk714AFLoHOtLBFhHdofOL Joi3THk+YpAKw== From: Raghav Gururajan Message-ID: <8922c4a6-4f24-923b-2509-d3cf89b15ea6@disroot.org> Date: Thu, 24 Sep 2020 08:41:50 -0400 Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------E4D6D1AEF5173968E9AE0766" Content-Language: en-US X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=Zo0attPa; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.59 X-TUID: 739WpV0lOZdJ This is a multi-part message in MIME format. --------------E4D6D1AEF5173968E9AE0766 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit @Danny Please find the attached split patches. Regards, RG. --------------E4D6D1AEF5173968E9AE0766 Content-Type: text/x-patch; charset=UTF-8; name="0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0012-gnu-glib-with-documentation-Make-some-cosmetic-chang.pa"; filename*1="tch" >From 0ce2e68413bf0e43081552f52692eb0fc4facf24 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:35:29 -0400 Subject: [PATCH 12/13] gnu: glib-with-documentation: Make some cosmetic changes. * gnu/packages/glib.scm (glib-with-documentation): Make some cosmetic changes. --- gnu/packages/glib.scm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2cda6cd000..9aebfb7e63 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -292,12 +292,7 @@ threads, dynamic loading, and an object system.") (package (inherit glib) (properties (alist-delete 'hidden? (package-properties glib))) - (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference - (native-inputs - `(("gtk-doc" ,gtk-doc) ; for the doc - ("docbook-xml" ,docbook-xml) - ("libxml2" ,libxml2) - ,@(package-native-inputs glib))) + (outputs (cons "doc" (package-outputs glib))) (arguments (substitute-keyword-arguments (package-arguments glib) ((#:configure-flags flags ''()) @@ -312,7 +307,12 @@ threads, dynamic loading, and an object system.") (copy-recursively (string-append out html) (string-append doc html)) (delete-file-recursively (string-append out html)) - #t))))))))) + #t))))))) + (native-inputs + `(("docbook-xml" ,docbook-xml) + ("gtk-doc" ,gtk-doc) + ("libxml2" ,libxml2) + ,@(package-native-inputs glib))))) (define gobject-introspection (package -- 2.28.0 --------------E4D6D1AEF5173968E9AE0766 Content-Type: text/x-patch; charset=UTF-8; name="0013-gnu-glib-with-documentation-Fix-documentation.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0013-gnu-glib-with-documentation-Fix-documentation.patch" >From 160c6a756386e0464938e6784f579c156d6e2c2e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 08:39:00 -0400 Subject: [PATCH 13/13] gnu: glib-with-documentation: Fix documentation. * gnu/packages/glib.scm (glib-with-documentation) [arguments]<#:phases>['patch-docbook-xml]: New phase. ['move-doc]: Modify phase. --- gnu/packages/glib.scm | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9aebfb7e63..b15c75a740 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -299,14 +299,28 @@ threads, dynamic loading, and an object system.") `(cons "-Dgtk_doc=true" ,flags)) ((#:phases phases) `(modify-phases ,phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs/reference" + (substitute* '("gio/gdbus-object-manager-example/.*\\.xml" + "gio/.*\\.xml" "glib/.*\\.xml" "gobject/.*\\.xml") + (("http://www.oasis-open.org/docbook/xml/4.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/"))) + (substitute* "gio/gio.xml" + (("http://www.oasis-open.org/docbook/xml/4.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/xml/dtd/docbook/")))) + #t)) (add-after 'install 'move-doc (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (doc (assoc-ref outputs "doc")) - (html (string-append "/share/gtk-doc"))) - (copy-recursively (string-append out html) - (string-append doc html)) - (delete-file-recursively (string-append out html)) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/gtk-doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out html) + (string-append doc html)) #t))))))) (native-inputs `(("docbook-xml" ,docbook-xml) -- 2.28.0 --------------E4D6D1AEF5173968E9AE0766--