From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id kL82M1eK5mQl0QAASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:38:15 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id OOYrM1eK5mRCbwAA9RJhRA (envelope-from ) for ; Thu, 24 Aug 2023 00:38:15 +0200 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 88C4E45DA0 for ; Thu, 24 Aug 2023 00:38:15 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1692830295; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post; bh=RKs4Tpj7FrLVLPH4Y9Wy7vEw0NmjSnQFwFekVrSdP7k=; b=sciTvPl3yG1C8ywL8zJIG+DmNAuVAqZPfBNRk4PMLf3iJNXOw7PveMl9fT6JzllWE66NY7 y5n5m3g09GXatUDCTGgxOPv1Bm3IPGFrcxdvMBNVdE5ayXKDFUZu+XREJMSNYV4k0ET7E2 so6VE7lXjNvJdpOvXvtEs1oM8UdRjexd+8PDYlZNP3V76h71L6X4/z2lkArBJM5Y2Gl+xu 4zKqVJ9iAOu6AIY/Jp9celReMvvO7jI3M0wzRcs+1hwx4NXlScvpXrJsrxX+LWzXynglFQ 8izHYRK1v2AkSFEVY50/Eatg8maB1+BELmboGOEsQPdSxPvz4qSll8H3gGiWNA== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Seal: i=1; s=key1; d=yhetil.org; t=1692830295; a=rsa-sha256; cv=none; b=djPRQ5Edp2uC24z9xEfh3AgBzFitwLMnNcJ9CtphOpted/uCriFPJmPENlLWfEN8B8V3qe D8q8o9aqU8KYFwOrctYPIC0QiYxiLWClKX8qcfguBCU3CTKZcphUhBf1WYtWDlWa4e6aQV oP4OG4mMY7tGLTa3pN1gtvl7dEV1sqVZh4QqDhCXEoPUodHNKlZoVPNDServzNbXxrFVn2 DzM9kTKph1RyM2NopYDR6tp5jv7c8mCDXAYYU+MvnmzpZ2xZmrlJje/bqpV+6Orc8BtLoE 9sN1zLs623RhMEfgNVpyA1Y60k1ldhWiepCNvKy3NfzELuFx8oWrtOgjTNSMug== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwTV-00085U-Q1; Wed, 23 Aug 2023 18:37:17 -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 1qYwTT-00083f-7o for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:15 -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 1qYwTS-000502-Ve for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:14 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwTW-0004Ew-Hd for guix-patches@gnu.org; Wed, 23 Aug 2023 18:37:18 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 26/61] gnu: xdg-utils: Drop docbook workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:37:18 +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.169283023716287 (code B ref 65479); Wed, 23 Aug 2023 22:37:18 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:37:17 +0000 Received: from localhost ([127.0.0.1]:35462 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTU-0004EJ-Vn for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:37:17 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37462) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwT9-00047H-V3 for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:36:56 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id 0533320E8F for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:14 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 755D980098; Thu, 24 Aug 2023 00:36:14 +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 bENzUZkOsOob; Thu, 24 Aug 2023 00:36:13 +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 67B6780099; Thu, 24 Aug 2023 00:36:13 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:18 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Migadu-Spam-Score: -5.21 X-Spam-Score: -5.21 X-Migadu-Queue-Id: 88C4E45DA0 X-TUID: 94g7uMI/4Y3F * gnu/packages/freedesktop.scm (xdg-utils)[arguments]<#:phases>: Drop locate-catalog-files. [modules]: Properly import gnu-build-system modules. [native-inputs]: Reorder. --- gnu/packages/freedesktop.scm | 33 +++++---------------------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0e80550492..85935545f9 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Alex Devaure +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -480,7 +481,8 @@ (define-public xdg-utils "1nai806smz3zcb2l5iny4x7li0fak0rzmjg6vlyhdqm8z25b166p")))) (build-system gnu-build-system) (native-inputs - (list docbook-xsl docbook-xml-4.1.2 libxslt w3m-for-tests xmlto)) + (list docbook-xsl docbook-xml-4.1.2 + libxslt xmlto w3m-for-tests)) (inputs (list bash-minimal ;for 'wrap-program' coreutils @@ -496,7 +498,8 @@ (define-public xdg-utils (list #:tests? #f ;no check target #:modules `((srfi srfi-26) - ,@%gnu-build-system-modules) + (guix build gnu-build-system) + (guix build utils)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-hardcoded-paths @@ -507,32 +510,6 @@ (define-public xdg-utils (substitute* "scripts/xdg-open.in" (("/usr/bin/printf") (search-input-file inputs "bin/printf"))))) - (add-before 'build 'locate-catalog-files - (lambda* (#:key native-inputs inputs #:allow-other-keys) - (let* ((native (or native-inputs inputs)) - (xmldoc (search-input-directory native - "xml/dtd/docbook")) - (xsldoc (search-input-directory - native - (string-append "xml/xsl/docbook-xsl-" - #$(package-version - (this-package-native-input - "docbook-xsl")))))) - (for-each (lambda (file) - (substitute* file - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd")))) - (find-files "scripts/desc" "\\.xml$")) - (substitute* "scripts/Makefile" - ;; Apparently `xmlto' does not bother to looks up the stylesheets - ;; specified in the XML, unlike the above substitition. Instead it - ;; uses a hard-coded URL. Work around it here, but if this is - ;; common perhaps we should hardcode this path in xmlto itself. - (("\\$\\(XMLTO\\) man") - (string-append "$(XMLTO) -x " xsldoc - "/manpages/docbook.xsl man"))) - (setenv "STYLESHEET" - (string-append xsldoc "/html/docbook.xsl"))))) (add-after 'install 'wrap-executables (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((dependencies '("awk" "grep" "hostname" "ls" "mimeopen" -- 2.40.1