From patchwork Sat Sep 23 14:20:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54191 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 5C6E227BBE9; Sat, 23 Sep 2023 15:23:09 +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 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 9B41A27BBE2 for ; Sat, 23 Sep 2023 15:23:07 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3X9-0007i9-Vz; Sat, 23 Sep 2023 10: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 1qk3X7-0007d7-Oz for guix-patches@gnu.org; Sat, 23 Sep 2023 10: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 1qk3X5-0003MB-Vm for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3XH-000894-6L for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:07 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 29/62] gnu: udisks: Drop docbook workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:23:07 +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 Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169547896331174 (code B ref 65479); Sat, 23 Sep 2023 14:23:07 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:22:43 +0000 Received: from localhost ([127.0.0.1]:40270 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Wt-00086f-1i for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:43 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:42694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Wb-000852-8C for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:25 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 2C45A20DEF for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:29 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 907B48009E; Sat, 23 Sep 2023 16:21:29 +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 GjP3Z4Is5y0t; Sat, 23 Sep 2023 16:21:29 +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 40E0980099; Sat, 23 Sep 2023 16:21:28 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:04 +0100 Message-ID: <3860d9f5cbe578fbabe0beaa4e37d3b3be9c21ca.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.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 XML_CATALOG_FILES is already set by xsltproc. * gnu/packages/freedesktop.scm (udisks)[arguments]<#:make-flags>: Remove. --- gnu/packages/freedesktop.scm | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 690a83b26f..bb47d2311f 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1541,20 +1541,6 @@ (define-public udisks (string-append "--with-html-dir=" #$output:doc "/share/doc/udisks/html") (string-append "--with-udevdir=" #$output "/lib/udev")) - #:make-flags - #~(let* ((docbook-xsl-name-version - #$(string-append (package-name docbook-xsl) "-" - (package-version docbook-xsl))) - (docbook-xsl-catalog-file - (string-append #$(this-package-native-input "docbook-xsl") - "/xml/xsl/" docbook-xsl-name-version - "/catalog.xml")) - (docbook-xml-catalog-file - #$(file-append (this-package-native-input "docbook-xml") - "/xml/dtd/docbook/catalog.xml"))) - ;; Reference the catalog files required to build the manpages. - (list (string-append "XML_CATALOG_FILES=" docbook-xsl-catalog-file - " " docbook-xml-catalog-file))) #:phases #~(modify-phases %standard-phases (add-before 'configure 'fix-girdir