From patchwork Thu Aug 24 04:15:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53181 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 9435727BBE9; Thu, 24 Aug 2023 05:23:23 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 79A8227BBE2 for ; Thu, 24 Aug 2023 05:23:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qZ1s4-0008RX-IS; Thu, 24 Aug 2023 00:23:00 -0400 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 1qZ1s2-0008R2-Tj for guix-patches@gnu.org; Thu, 24 Aug 2023 00:22:58 -0400 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 1qZ1s2-0006u0-LX for guix-patches@gnu.org; Thu, 24 Aug 2023 00:22:58 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qZ1s6-0004jQ-DF for guix-patches@gnu.org; Thu, 24 Aug 2023 00:23:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH 44/61] gnu: iputils: Drop docbook workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 24 Aug 2023 04:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65479 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65479@debbugs.gnu.org Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169285094918133 (code B ref 65479); Thu, 24 Aug 2023 04:23:02 +0000 Received: (at 65479) by debbugs.gnu.org; 24 Aug 2023 04:22:29 +0000 Received: from localhost ([127.0.0.1]:35836 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ1rY-0004iP-HO for submit@debbugs.gnu.org; Thu, 24 Aug 2023 00:22:28 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:41548) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qZ1rV-0004iD-1s for 65479@debbugs.gnu.org; Thu, 24 Aug 2023 00:22:26 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id B9B0F20DB2 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:22:20 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id D2EC780097 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:15:53 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail1.netim.hosting Received: from mail1.netim.hosting ([127.0.0.1]) by localhost (mail1-2.netim.hosting [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id zP6ukAf9MvAv for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:15:53 +0200 (CEST) Received: from guix-nuc.home.arpa (unknown [10.192.1.83]) (Authenticated sender: lumen@makinata.eu) by mail1.netim.hosting (Postfix) with ESMTPSA id 58F5D80092 for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 06:15:53 +0200 (CEST) From: Bruno Victal Date: Thu, 24 Aug 2023 05:15:48 +0100 Message-Id: <855eb2fb2b07cbca8ac7936147fff681004b2fc4.1692828533.git.mirai@makinata.eu> X-Mailer: git-send-email 2.40.1 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/networking.scm (iputils)[arguments]<#:phases>: Drop 'fix-docbook-url phase. [native-inputs]: Use docbook-xml-5.0.1 over docbook-xml. --- gnu/packages/networking.scm | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/gnu/packages/networking.scm b/gnu/packages/networking.scm index 488d015107..f0ba9925c9 100644 --- a/gnu/packages/networking.scm +++ b/gnu/packages/networking.scm @@ -1590,27 +1590,12 @@ (define-public iputils "04bp4af15adp79ipxmiakfp0ij6hx5qam266flzbr94pr8z8l693")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-DBUILD_RARPD=true") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-docbook-url - (lambda* (#:key inputs #:allow-other-keys) - (let* ((docbook-xsl (assoc-ref inputs "docbook-xsl")) - (uri (string-append docbook-xsl "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)))) - (for-each - (lambda (file) - (substitute* file - (("http://docbook\\.sourceforge\\.net/release/xsl-ns/current") - uri))) - (cons "doc/meson.build" - (find-files "doc" "\\.xsl$"))) - #t)))))) + `(#:configure-flags '("-DBUILD_RARPD=true"))) (native-inputs `(("gettext" ,gettext-minimal) ("pkg-config" ,pkg-config) ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml) + ("docbook-xml" ,docbook-xml-5.0.1) ("libxml2" ,libxml2) ;for XML_CATALOG_FILES ("xsltproc" ,libxslt))) (inputs