From patchwork Mon Oct 9 20:06:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bruno Victal X-Patchwork-Id: 54680 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 3991827BBE9; Mon, 9 Oct 2023 21:11:12 +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,URIBL_BLOCKED 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 A791B27BBE2 for ; Mon, 9 Oct 2023 21:11:10 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qpwYv-0007DK-EU; Mon, 09 Oct 2023 16:09:09 -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 1qpwYg-0006hu-ME for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:57 -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 1qpwYc-0008CJ-I5 for guix-patches@gnu.org; Mon, 09 Oct 2023 16:08:54 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qpwYx-0002eU-8d for guix-patches@gnu.org; Mon, 09 Oct 2023 16:09:11 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v3 28/63] gnu: xdg-user-dirs: Drop docbook workaround. Resent-From: Bruno Victal Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 09 Oct 2023 20:09:11 +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.16968821369988 (code B ref 65479); Mon, 09 Oct 2023 20:09:11 +0000 Received: (at 65479) by debbugs.gnu.org; 9 Oct 2023 20:08:56 +0000 Received: from localhost ([127.0.0.1]:33404 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYh-0002b1-Kz for submit@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:55 -0400 Received: from smtpm3.myservices.hosting ([185.26.105.234]:59520) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qpwYf-0002at-KO for 65479@debbugs.gnu.org; Mon, 09 Oct 2023 16:08:54 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpm3.myservices.hosting (Postfix) with ESMTP id 447D321053 for <65479@debbugs.gnu.org>; Mon, 9 Oct 2023 22:07:27 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id AB142800A0; Mon, 9 Oct 2023 22:07: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 I3Qnm_WQn-uk; Mon, 9 Oct 2023 22:07:27 +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 37E3280060; Mon, 9 Oct 2023 22:07:25 +0200 (CEST) From: Bruno Victal Date: Mon, 9 Oct 2023 21:06:16 +0100 Message-ID: <64801de1ea55a8f510558954e9f15fa2edd0f333.1696881354.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 * 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 250f742f6c..d1f767acd6 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -2232,29 +2232,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