Message ID | cdb76f99e354839d87d5c55116a6a55b29a4cc49.1695478390.git.mirai@makinata.eu |
---|---|
State | New |
Headers |
Return-Path: <guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org> X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id ADB3B27BBE2; Sat, 23 Sep 2023 15:23:40 +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=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 6178627BBEA for <patchwork@mira.cbaines.net>; Sat, 23 Sep 2023 15:23:39 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from <guix-patches-bounces@gnu.org>) id 1qk3X9-0007hN-Ic; 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 <Debian-debbugs@debbugs.gnu.org>) id 1qk3X7-0007dB-SN for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:58 -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 <Debian-debbugs@debbugs.gnu.org>) id 1qk3X5-0003M8-JW for guix-patches@gnu.org; Sat, 23 Sep 2023 10:22:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1qk3XG-00088v-Kr for guix-patches@gnu.org; Sat, 23 Sep 2023 10:23:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65479] [PATCH core-updates v2 27/62] gnu: xdg-user-dirs: Drop docbook workaround. Resent-From: Bruno Victal <mirai@makinata.eu> Original-Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org> Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 23 Sep 2023 14:23:06 +0000 Resent-Message-ID: <handler.65479.B65479.169547896331168@debbugs.gnu.org> 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 <mirai@makinata.eu> Received: via spool by 65479-submit@debbugs.gnu.org id=B65479.169547896331168 (code B ref 65479); Sat, 23 Sep 2023 14:23:06 +0000 Received: (at 65479) by debbugs.gnu.org; 23 Sep 2023 14:22:43 +0000 Received: from localhost ([127.0.0.1]:40268 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces@debbugs.gnu.org>) id 1qk3Ws-00086Y-Ne for submit@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:43 -0400 Received: from smtpmciv5.myservices.hosting ([185.26.107.241]:42680) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <mirai@makinata.eu>) id 1qk3WW-00084r-Bb for 65479@debbugs.gnu.org; Sat, 23 Sep 2023 10:22:20 -0400 Received: from mail1.netim.hosting (unknown [185.26.106.173]) by smtpmciv5.myservices.hosting (Postfix) with ESMTP id 580C020DEE for <65479@debbugs.gnu.org>; Sat, 23 Sep 2023 16:21:28 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mail1.netim.hosting (Postfix) with ESMTP id BDBDB8009C; 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 Jg19xhiMyisv; Sat, 23 Sep 2023 16:21: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 3714080099; Sat, 23 Sep 2023 16:21:27 +0200 (CEST) From: Bruno Victal <mirai@makinata.eu> Date: Sat, 23 Sep 2023 15:20:02 +0100 Message-ID: <cdb76f99e354839d87d5c55116a6a55b29a4cc49.1695478390.git.mirai@makinata.eu> X-Mailer: git-send-email 2.41.0 In-Reply-To: <cover.1695478390.git.mirai@makinata.eu> References: <cover.1692828533.git.mirai@makinata.eu> <cover.1695478390.git.mirai@makinata.eu> 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: <guix-patches.gnu.org> List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=unsubscribe> List-Archive: <https://lists.gnu.org/archive/html/guix-patches> List-Post: <mailto:guix-patches@gnu.org> List-Help: <mailto:guix-patches-request@gnu.org?subject=help> List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-patches>, <mailto:guix-patches-request@gnu.org?subject=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 |
Series |
Docbook & XML/SGML improvements.
|
|
Commit Message
Bruno Victal
Sept. 23, 2023, 2:20 p.m. UTC
* 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