From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id qJbiBuf0DmUO2gAAG6o9tA:P1 (envelope-from ) for ; Sat, 23 Sep 2023 16:23:35 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id qJbiBuf0DmUO2gAAG6o9tA (envelope-from ) for ; Sat, 23 Sep 2023 16:23:35 +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 0CF193E434 for ; Sat, 23 Sep 2023 16:23:35 +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=1695479015; 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=osTxRKKabzsS9z1iziwa4O/93y4m74ZEO6u6lw06zfc=; b=Le2XwUP4mb0Cm7gmm5bAYaRYnhI8LTDpgtI4RanJLuDOldbw4NguBaoI//8BZoWDz7WMpT Sm9FEGpFR5nEGVZLsAofJTNMVI+Y93SLcQSBHu1lEyDvi5kIDlJXpmHfDm61g8zm4yqlBe 8R/nff7Ff7Th6s0mC/AiJJYxElrrmScl7khAQD3wfOFvrt3LcqmUj1pDl0xOn+4M4orVfk h+kOpktj94Y50idAWe7K58ptsoU6aWUMpXucmQQpgIm2dIm3BPToS8Ac8L0GiOOgiEYQLl /Oyxq6sesEDSnZvgSXN75QTT7VXumYJezjTTDaAMx8RYNEwo/kN+s4Yz4fcDPQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1695479015; a=rsa-sha256; cv=none; b=p1PuuGyc2Aqf459aiEC29M/1ssiXMwveeHG8f0psCqifuUN5FjIHP+SofRmIFSSu20uLWa n7TPGd3ko1BIjYwA/3QuYWiiawHx5NG14SvMOnejnneLpvWd/WGrUzAayP4DmUzKonIni5 fu2y9Luej0cOax+HwVqoYWBS3APjKZWC4IrLQTWjG3F/EkoyKReM0YzqQYo2un+YHAHjzo VGsi/95f1VpCNwJrCPea5cznDzSn3CRpeSFeFg99jMaRc6QzW72jNFzWLLEw+5/nYkdYV4 jlY6i6udZEDA28NlVH65k+fvY8v/UfqcvCHGa2/YlMUEw1K+dXKXOXTJ4P8EuQ== 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 Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qk3X9-0007gL-75; Sat, 23 Sep 2023 10:22:59 -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 1qk3X5-0007YS-GP for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:55 -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 1qk3X4-0003LD-K5 for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qk3XF-00088h-Q8 for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 26/62] gnu: xdg-utils: Drop docbook workarounds. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:23:05 +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.169547896231154 (code B ref 65479); Sat, 23 Sep 2023 14:23:05 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:22:42 +0000 Received: from localhost ([127.0.0.1]:40264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3Ws-00086I-04 for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:42 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:42666) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qk3WS-00084X-2w for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:16 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 1F3CC20DED for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id 6E8BA8009D; Sat, 23 Sep 2023 16:21:27 +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 x4IHTNRZRmCi; Sat, 23 Sep 2023 16:21:26 +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 A88078009E; Sat, 23 Sep 2023 16:21:26 +0200 (CEST) From: Bruno Victal Date: Sat, 23 Sep 2023 15:20:01 +0100 Message-ID: X-Mailer: git-send-email 2.41.0 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-Spam-Score: -5.27 X-Migadu-Spam-Score: -5.27 X-Migadu-Scanner: mx1.migadu.com X-Migadu-Queue-Id: 0CF193E434 X-TUID: SpROmf7n7sHr * 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 e4f8b16755..250f742f6c 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. ;;; @@ -482,7 +483,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 @@ -498,7 +500,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 @@ -509,32 +512,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.41.0