From patchwork Mon Nov 11 06:16:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 70245 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 3923127BBEA; Mon, 11 Nov 2024 06:25:12 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id A2C8927BBE2 for ; Mon, 11 Nov 2024 06:25:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tANqM-0002Uw-H5; Mon, 11 Nov 2024 01:24:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tANqF-0002Jr-7Q for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tANqE-00077u-Us for guix-patches@gnu.org; Mon, 11 Nov 2024 01:24:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=aaMziImqMPH6vXT8eXUoIyCOp0I2WpvNaBPFZCvwLjU=; b=e9prvJ+F35rvOxyfj5sax4CxiGuOPxgLHGUqVtWRwi5Gvsz7GJ2PkNnptAJctxwl5C4xsvg//sP2hAES+PKnmL25D45cOBK1oCtNOTdUmzQlCEhWEk4qJ0ALOMr8tp2HSii++YFhm0/DGzcZC7stTmlMHBxUa+4KSEfmUZkobzFcnYJ0KvWclUVfwY2e0ujEbnaGZFjVviXHn/Ic8Zd0W6+G8jpsB/vTQxme6rcbt9Myq7to6xQkvvWWImvAfyOh7IeUhD1KgHhSmlgc/Ho10TSdkARRlOag0cQiu5eXqI663sKiQY/SRLUOKrbC3RWdVKvp3xzn+85KW2rYJ02Xbw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tANqE-0006Gw-MR; Mon, 11 Nov 2024 01:24:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#74306] [PATCH gnome-team 16/44] gnu: glib: Fix build. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, liliana.prikler@gmail.com, vivien@planete-kraus.eu, guix-patches@gnu.org Resent-Date: Mon, 11 Nov 2024 06:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74306 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 74306@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus X-Debbugs-Original-Xcc: Maxim Cournoyer , Liliana Marie Prikler , Vivien Kraus Received: via spool by 74306-submit@debbugs.gnu.org id=B74306.173130619123804 (code B ref 74306); Mon, 11 Nov 2024 06:24:02 +0000 Received: (at 74306) by debbugs.gnu.org; 11 Nov 2024 06:23:11 +0000 Received: from localhost ([127.0.0.1]:57665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANpO-0006Bm-SD for submit@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:11 -0500 Received: from mail-ot1-f48.google.com ([209.85.210.48]:59436) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tANpL-0006Al-Ot for 74306@debbugs.gnu.org; Mon, 11 Nov 2024 01:23:08 -0500 Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-71822fabf4fso2376199a34.2 for <74306@debbugs.gnu.org>; Sun, 10 Nov 2024 22:23:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1731306127; x=1731910927; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=aaMziImqMPH6vXT8eXUoIyCOp0I2WpvNaBPFZCvwLjU=; b=gy0pFX4eYeTwEK/RfrMc8kSEV5eulzys5oeWVvIGjK/3orcLgak8O9fnz4trpm/6Ox ksrjJrSQaUkVveUo/NivVK2XyNB4qKID6CERZk359A+d2UlB5dQlHzMX3Ac78tOeOSFb RGiBB9bvozDN8xVLQjgt2GIr0GVNLSbkQYUngJAbCSGQgNzVHnw3j1U/xK/V1oK4CxoC 2u1zQ9DF2gq680tpdmkdmX10aJN6sIXYgLvRsHGVKCYWjzitsiTlIuDrbEkBPSEgSboR QEskiYFBpf8465sCzJhQutbfHwUeHtanE7mpdcsjeTLlGghPcT1aMSsV1L73cpgXrLX2 mUmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1731306127; x=1731910927; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=aaMziImqMPH6vXT8eXUoIyCOp0I2WpvNaBPFZCvwLjU=; b=bi02BdUQUCGxJZ53V4Z9nCErUEE7cp/VHRwyEVYrIfqEZHvDsz2qZPolIj8e6D8UL7 V6N/e8cnmLzAeXza13hqdO/3h+6MeOrhabtIt3HAU1b0YOuMel3Kgnuv38dCN9PSQcb8 OyZTlHQTgwVTKXFFhPJowp7wfKxgPjga3Nv6MLR4z7VhVsfOYkyQwaY+lzmWulDhSXIh LscfbX+pZBpTfgT883nXG7/o1/sTwFtNWGdT3Pt98NLMlw3FHNyBkRxV8PvbeTiS7ZSZ uD3ImZj2WvzXlUyMp+w5Qa8Y9SHbBx/W8je5H4i5Q/lvw1SZcyHFfwQycCm9vx90RWMO cnGQ== X-Gm-Message-State: AOJu0YxsMRgrwiiNMmf7rC+cyIG8ckYayG9j9EKkT9O9GZbM4GM1/Soa vxd4euT4ozIVbeAnObFCn1ABscjiCgYeagoUm3EK/E9DkJpOTgVag9J+Tg== X-Google-Smtp-Source: AGHT+IHuGuXR9HX2EfCrep8GfztWiOLuE66Svtx8Fhee2akXbbmd0KMEVAjCZ92KRZmgaFlSM0HzbQ== X-Received: by 2002:a05:6830:498d:b0:718:194d:8a6 with SMTP id 46e09a7af769-71a1c28846amr11812553a34.28.1731306126875; Sun, 10 Nov 2024 22:22:06 -0800 (PST) Received: from localhost.localdomain ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7f41f5ea0d5sm7782996a12.47.2024.11.10.22.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 10 Nov 2024 22:22:06 -0800 (PST) From: Maxim Cournoyer Date: Mon, 11 Nov 2024 15:16:59 +0900 Message-ID: <542c1fbab63036afb8bbdf38e4669a3bee9f2517.1731303037.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/glib.scm (glib-with-documentation) [native-inputs]: Remove docbook-xml-4.2, docbook-xml, docbook-xsl, gtk-doc, libxml2, libxslt inputs. Add gi-docgen and python-docutils. [arguments] Replace 'gtk_doc' option with 'documentation'. : Delete patch-docbook-xml phase. Adjust move-doc phase. Change-Id: I964a79603ff80ee8a22bb2d9ebe07f05a1f79e57 --- gnu/packages/glib.scm | 35 +++++++++-------------------------- 1 file changed, 9 insertions(+), 26 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1a8ecdad35..2732d739bf 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -545,41 +545,24 @@ (define-public glib-with-documentation (let ((base glib)) (package/inherit base (properties (alist-delete 'hidden? (package-properties base))) - (outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference + (outputs (cons "doc" (package-outputs base))) (native-inputs - `(("docbook-xml-4.2" ,docbook-xml-4.2) - ("docbook-xml-4.5" ,docbook-xml) - ("docbook-xsl" ,docbook-xsl) - ("gtk-doc" ,gtk-doc/stable) - ("libxml2" ,libxml2) - ("xsltproc" ,libxslt) - ,@(package-native-inputs base))) + (modify-inputs (package-native-inputs base) + (append gi-docgen python-docutils))) (arguments (substitute-keyword-arguments (package-arguments base) ((#:configure-flags flags ''()) - #~(cons "-Dgtk_doc=true" + #~(cons "-Ddocumentation=true" (delete "-Dman=false" #$flags))) ((#:phases phases) #~(modify-phases #$phases - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - (with-directory-excursion "docs" - (substitute* (find-files "." "\\.xml$") - (("http://www.oasis-open.org/docbook/xml/4\\.5/") - (string-append (assoc-ref inputs "docbook-xml-4.5") - "/xml/dtd/docbook/")) - (("http://www.oasis-open.org/docbook/xml/4\\.2/") - (string-append (assoc-ref inputs "docbook-xml-4.2") - "/xml/dtd/docbook/")))))) (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"))) - (mkdir-p (string-append doc "/share")) + (lambda _ + (let ((doc "/share/doc")) + (mkdir-p (string-append #$output:doc "/share")) (rename-file - (string-append out html) - (string-append doc html)))))))))))) + (string-append #$output doc) + (string-append #$output:doc doc)))))))))))) (define (python-extension-suffix python triplet) "Determine the suffix for C extensions for PYTHON when compiled