From patchwork Wed Aug 23 22:35:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 53160 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 5391127BBE9; Wed, 23 Aug 2023 23:40:37 +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=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 8264227BBE2 for ; Wed, 23 Aug 2023 23:40:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTX-0008FJ-Ma; Wed, 23 Aug 2023 18:37:19 -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 1qYwTN-0007qu-Uk for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:09 -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 1qYwTN-0004xc-Dn for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:09 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTQ-0004D9-W4 for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:13 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 29/61] gnu: udisks: Drop docbook workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:12 +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.169283021915898 (code B ref 65479); Wed, 23 Aug 2023 22:37:12 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:36:59 +0000 Received: from localhost ([127.0.0.1]:35400 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTC-00048G-St for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:59 -0400 Received: from smtpm5.myservices.hosting ([185.26.105.236]:33714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwSq-00044S-4X for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:36 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm5.myservices.hosting (Postfix) with ESMTP id 514CF20CFC for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:15 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 63AF680060; Thu, 24 Aug 2023 00:36:15 +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 xh3ko4-JhOCN; Thu, 24 Aug 2023 00:36:15 +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 6DA1280097; Thu, 24 Aug 2023 00:36:14 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:21 +0100 Message-Id: <0c86d3b22a71d514f9aa88109cb4cf500c8a050e.1692830150.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 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 61d830d74b..9b5a714be9 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1528,20 +1528,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