From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.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 gETZL52K5mTbHgEASxT56A (envelope-from ) for ; Thu, 24 Aug 2023 00:39:25 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id AJrwLp2K5mTG4AAAG6o9tA (envelope-from ) for ; Thu, 24 Aug 2023 00:39:25 +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 71B7745E96 for ; Thu, 24 Aug 2023 00:39:25 +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=1692830365; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=ca7CbmL9AV+tmh/smi9IE+ud659ZVeHDRVBKM+FZwBk=; b=Tkp1JqwsT8PSEBqo0WtilnBJIHM332rZUOXoADVH51AawIYxZ48IvmTiXFSbV2CpFnrPty 9eHNJ895+HrxIUE6TOf2YpVl4/DEtUUd7zUw0Qx1r03EtQM+R1kyJqsVFhinecAn38X0wR X668YSnVAoJo1tt65G0sIf7cQFYTvax/XzUqRpaGXnw1f/ukSC57tiahbLC3CevF866ASy pPSfFaoF52GDzjsZCsYwJjTqSJnKSR3qo2n2D8OAg2Zzb5pldrA6PWM9wmn8To2AEiFeXS JSjZQ7IJtEueTPHTEJV4PihWHLGY44gAQ+LeI8OJ5jIMLCExGUtoq2ALJSOVaA== 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=1692830365; a=rsa-sha256; cv=none; b=Le75qwkFO652Nm37uf9LwgUG5UnqSGSw29Bm4O1L49aETBXtXQpVUb3KbE1YQzpk+TVWP7 1TszHbsXq0YLgFJf+QGkDaWzVsm5rE0BDRNm0Iy55D4jSBHZXTJOTse2O9ljq54Xlor0rS TQjISAo9ayEm0UwsBBprc9/6X1C/PrIX5lYJTih6n4c31sKjOrdoDa6Cb8O5LWNQ0GNS+1 HhemM0jYN/jd9yyaD/bOnml/KomlnIuET12EQojJKG8oDbfWUYszGViyVhWym0r9zuGa1h HZzg/Sf00eEAumRJ1m00NqYcVCGuqYTzHoGS1twrny7pmjexzYDIiz9lLjDHOw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qYwUT-0000YY-QU; Wed, 23 Aug 2023 18:38: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 1qYwUC-0000Fu-9O for guix-patches@gnu.org; Wed, 23 Aug 2023 18:38:03 -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 1qYwUB-00058Z-Dk for guix-patches@gnu.org; Wed, 23 Aug 2023 18:38:00 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qYwUE-0004HI-VA for guix-patches@gnu.org; Wed, 23 Aug 2023 18:38:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates 27/61] gnu: xdg-user-dirs: Drop docbook workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 23 Aug 2023 22:38: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 Cc: Bruno Victal Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169283024316345 (code B ref 65479); Wed, 23 Aug 2023 22:38:02 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Aug 2023 22:37:23 +0000 Received: from localhost ([127.0.0.1]:35472 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTX-0004FI-2a for submit@debbugs.gnu.org; Wed, 23 Aug 2023 18:37:22 -0400 Received: from smtpm2.myservices.hosting ([185.26.105.233]:37514) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qYwTM-0004Bp-Vx for 65479@debbugs.gnu.org; Wed, 23 Aug 2023 18:37:09 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm2.myservices.hosting (Postfix) with ESMTP id B217E20E5E for <65479@debbugs.gnu.org>; Thu, 24 Aug 2023 00:36:16 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id EE78580099; 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 K8p2lT48OG3S; Thu, 24 Aug 2023 00:36:14 +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 BACF180092; Thu, 24 Aug 2023 00:36:13 +0200 (CEST) From: Bruno Victal Date: Wed, 23 Aug 2023 23:35:19 +0100 Message-Id: X-Mailer: git-send-email 2.40.1 In-Reply-To: References: MIME-Version: 1.0 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: -4.71 X-Spam-Score: -4.71 X-Migadu-Queue-Id: 71B7745E96 X-TUID: iMrY7YBx77yu * gnu/packages/freedesktop.scm (xdg-user-dirs)[arguments]: Remove. [native-inputs]: Remove labels. --- gnu/packages/freedesktop.scm | 27 ++++----------------------- 1 file changed, 4 insertions(+), 23 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 85935545f9..cf7c2fbd4d 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2219,29 +2219,10 @@ (define-public xdg-user-dirs (base32 "13216b8rfkzak5k6bvpx6jvqv3cnbgpijnjwj8a8d3kq4cl0a1ra")))) (build-system gnu-build-system) (native-inputs - `(("gettext" ,gettext-minimal) - ("docbook-xsl" ,docbook-xsl) - ("docbook-xml" ,docbook-xml-4.3) - ("xsltproc" ,libxslt))) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'locate-catalog-files - (lambda* (#:key inputs #:allow-other-keys) - (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook")) - (xsldoc (string-append (assoc-ref inputs "docbook-xsl") - "/xml/xsl/docbook-xsl-" - ,(package-version docbook-xsl)))) - (for-each (lambda (file) - (substitute* file - (("http://.*/docbookx\\.dtd") - (string-append xmldoc "/docbookx.dtd")))) - (find-files "man" "\\.xml$")) - (substitute* "man/Makefile" - (("http://.*/docbook\\.xsl") - (string-append xsldoc "/manpages/docbook.xsl"))) - #t)))))) + (list gettext-minimal + docbook-xsl + docbook-xml-4.3 + libxslt)) (home-page "https://www.freedesktop.org/wiki/Software/xdg-user-dirs/") (synopsis "Tool to help manage \"well known\" user directories") (description "xdg-user-dirs is a tool to help manage \"well known\" user -- 2.40.1