[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates v2 26/62] gnu: xdg-utils: Drop docbook w
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates v2 26/62] gnu: xdg-utils: Drop docbook workarounds. |
Date: |
Sat, 23 Sep 2023 15:20:01 +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 e4f8b16755..250f742f6c 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.
;;;
@@ -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
- [bug#65479] [PATCH core-updates v2 31/62] gnu: criu: Drop xmlto workaround., (continued)
- [bug#65479] [PATCH core-updates v2 31/62] gnu: criu: Drop xmlto workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 06/62] gnu: docbook: Remove leftovers., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 18/62] gnu: dblatex: Fix missing texlive binaries., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 12/62] search-paths: Add $XML_CATALOG_FILES and $SGML_CATALOG_FILES., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 11/62] gnu: libxml2: Rewrite using G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 21/62] gnu: xmlto: Rewrite with G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 24/62] gnu: docbook2x: Drop docbook-xml workarounds., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 07/62] gnu: docbook-utils: Import patches from debian., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 14/62] gnu: libxslt: Set search-paths for XML and SGML catalogs., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 25/62] gnu: secilc: Drop xmlto workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 26/62] gnu: xdg-utils: Drop docbook workarounds.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates v2 15/62] gnu: dblatex: Add libxslt native-search-paths to its own., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 02/62] gnu: Add docbook-xml-5.0.1., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 27/62] gnu: xdg-user-dirs: Drop docbook workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 29/62] gnu: udisks: Drop docbook workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 16/62] gnu: dblatex: Split documentation., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 30/62] gnu: colord-gtk: Build documentation., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 33/62] gnu: git-crypt: Remove docbook workarounds., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 32/62] gnu: gtk: Drop docbook workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 34/62] gnu: gnome-session: Build documentation., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 09/62] gnu: docbook2x: Fix sgml2xml-isoent and add test dependencies., Bruno Victal, 2023/09/23