[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates 26/61] gnu: xdg-utils: Drop docbook work
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates 26/61] gnu: xdg-utils: Drop docbook workarounds. |
Date: |
Wed, 23 Aug 2023 23:35:18 +0100 |
* 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 <phodina@protonmail.com>
;;; Copyright © 2022 muradm <mail@muradm.net>
;;; Copyright © 2023 Alex Devaure <ajadevaure@gmail.com>
+;;; Copyright © 2023 Bruno Victal <mirai@makinata.eu>
;;;
;;; 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
- [bug#65479] [PATCH core-updates 18/61] gnu: dblatex: Fix missing texlive binaries., (continued)
- [bug#65479] [PATCH core-updates 18/61] gnu: dblatex: Fix missing texlive binaries., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 21/61] gnu: xmlto: Rewrite with G-Expressions., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 23/61] gnu: gtk-doc: Add libxslt native-search-paths to its own., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 25/61] gnu: secilc: Drop xmlto workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 35/61] gnu: metapixel: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 46/61] gnu: libnotify: Drop docbook workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 49/61] gnu: alsa-utils: Rewrite with G-Expressions., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 29/61] gnu: udisks: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 33/61] gnu: git-crypt: Remove docbook workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 32/61] gnu: gtk: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 26/61] gnu: xdg-utils: Drop docbook workarounds.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates 20/61] gnu: docbook2x: Set search-paths for XML and SGML catalogs., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 17/61] gnu: Add docbook-mathml-1.0., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 38/61] gnu: libxkbcommon: Faux propagate libxml2., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 03/61] gnu: docbook-xml-5.1: Fix URIs in catalog.xml., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 24/61] gnu: docbook2x: Drop docbook-xml workarounds., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 42/61] gnu: drumstick: Drop docbook workaround., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 22/61] gnu: xmlto: Add libxslt native-search-paths to its own., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 30/61] gnu: colord-gtk: Build documentation., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 28/61] gnu: udisks: Rewrite using G-Expressions., Bruno Victal, 2023/08/23
- [bug#65479] [PATCH core-updates 27/61] gnu: xdg-user-dirs: Drop docbook workaround., Bruno Victal, 2023/08/23