[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#65479] [PATCH core-updates v2 54/62] gnu: gtk-doc: Wrap XML_CATALOG
From: |
Bruno Victal |
Subject: |
[bug#65479] [PATCH core-updates v2 54/62] gnu: gtk-doc: Wrap XML_CATALOG_FILES. |
Date: |
Sat, 23 Sep 2023 15:20:29 +0100 |
Prefer XML catalog resolution over substitutions on XML files.
* gnu/packages/gtk.scm (gtk-doc)[arguments]<#:phases>: Remove
'patch-gtk-doc-scan. Wrap XML_CATALOG_FILES within 'wrap-executables.
---
gnu/packages/gtk.scm | 32 +++++++++++---------------------
1 file changed, 11 insertions(+), 21 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 87ce01dc19..69e9a3250a 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -2174,23 +2174,6 @@ (define-public gtk-doc
#:parallel-tests? #f
#:phases
#~(modify-phases %standard-phases
- (add-after 'unpack 'patch-gtk-doc-scan
- ;; Use a substitution to avoid setting docbook-xsl as a
- ;; propagated input.
- (lambda _
- (substitute* "gtk-doc.xsl"
-
(("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl")
- #$(let ((docbook-xsl (this-package-input "docbook-xsl")))
- (file-append docbook-xsl
- "/xml/xsl/" (package-name docbook-xsl)
- "-" (package-version docbook-xsl)
- "/html/chunk.xsl")))
-
(("http://docbook.sourceforge.net/release/xsl/current/common/en.xml")
- #$(let ((docbook-xsl (this-package-input "docbook-xsl")))
- (file-append docbook-xsl
- "/xml/xsl/" (package-name docbook-xsl)
- "-" (package-version docbook-xsl)
- "/common/en.xsl"))))))
(add-after 'unpack 'disable-failing-tests
(lambda _
(substitute* "tests/Makefile.am"
@@ -2198,10 +2181,17 @@ (define-public gtk-doc
""))))
(add-after 'install 'wrap-executables
(lambda _
- (for-each (lambda (prog)
- (wrap-program prog
- `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))))
- (find-files (string-append #$output "/bin"))))))))
+ (let ((docbook-xsl-catalog
+ #$(let ((docbook-xsl (this-package-input "docbook-xsl")))
+ (file-append docbook-xsl
+ "/xml/xsl/" (package-name docbook-xsl)
+ "-" (package-version docbook-xsl)
+ "/catalog.xml"))))
+ (for-each (lambda (prog)
+ (wrap-program prog
+ `("GUIX_PYTHONPATH" ":" prefix (,(getenv
"GUIX_PYTHONPATH")))
+ `("XML_CATALOG_FILES" " " suffix
(,docbook-xsl-catalog))))
+ (find-files (string-append #$output "/bin")))))))))
(native-inputs
(list gettext-minimal
`(,glib "bin")
--
2.41.0
- [bug#65479] [PATCH core-updates v2 38/62] gnu: libxkbcommon: Faux propagate libxml2., (continued)
- [bug#65479] [PATCH core-updates v2 38/62] gnu: libxkbcommon: Faux propagate libxml2., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 36/62] gnu: metapixel: Rewrite with G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 42/62] gnu: drumstick: Drop docbook workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 35/62] gnu: metapixel: Drop docbook workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 45/62] gnu: iputils: Restyle description and native-inputs., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 46/62] gnu: libnotify: Drop docbook workarounds., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 40/62] gnu: sssd: Drop xmllint workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 39/62] gnu: gnome-session: Remove libxml2., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 59/62] gnu: Remove unneeded libxml2 from native-inputs. (libxslt), Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 51/62] gnu: gdcm: Build manpages., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 54/62] gnu: gtk-doc: Wrap XML_CATALOG_FILES.,
Bruno Victal <=
- [bug#65479] [PATCH core-updates v2 50/62] gnu: tunctl: Update comment., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 43/62] gnu: vmpk: Drop docbook workaround., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 49/62] gnu: alsa-utils: Rewrite with G-Expressions., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 47/62] gnu: libnotify: Split documentation., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 48/62] gnu: alsa-utils: Build manpages., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 44/62] gnu: iputils: Use docbook-xml-5.0.1., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 55/62] gnu: gtk-doc: Remove leftovers., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 41/62] gnu: tdb: Build manpages., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 52/62] gnu: git: Drop docbook workarounds., Bruno Victal, 2023/09/23
- [bug#65479] [PATCH core-updates v2 53/62] gnu: gtk-doc: Rewrite with G-Expressions., Bruno Victal, 2023/09/23