diff options
| author | Bruno Victal <[email protected]> | 2023-10-09 21:05:59 +0100 |
|---|---|---|
| committer | Ludovic Courtès <[email protected]> | 2024-08-31 10:42:08 +0200 |
| commit | 5b6c9ca5203b5fe675422a6ef8972e5e11b1e140 (patch) | |
| tree | c5aa948e7b2f6575ed188aed9d32b42ee2828a5d /gnu/packages/docbook.scm | |
| parent | 7e4ddd2d2e11c3a978a56b20aec6cd2e5935d07a (diff) | |
gnu: docbook-utils: Import patches from debian.
* gnu/packages/docbook.scm (docbook-utils)[source]: Import patches from debian.
Drop snippet for patching OpenSP and OpenJade.
[native-inputs]: Add autoconf, automake and libtool.
* gnu/packages/patches/docbook-utils-documentation-edits.patch: New file.
* gnu/packages/patches/docbook-utils-escape-characters.patch: Ditto.
* gnu/packages/patches/docbook-utils-remove-jade-sp.patch: Ditto.
* gnu/packages/patches/docbook-utils-respect-refentry-for-name.patch: Ditto.
* gnu/packages/patches/docbook-utils-source-date-epoch.patch: Ditto.
* gnu/packages/patches/docbook-utils-use-date-element.patch: Ditto.
* gnu/local.mk: Register them.
Signed-off-by: Maxim Cournoyer <[email protected]>
Diffstat (limited to 'gnu/packages/docbook.scm')
| -rw-r--r-- | gnu/packages/docbook.scm | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/gnu/packages/docbook.scm b/gnu/packages/docbook.scm index f310b8f7b8..8f973d0814 100644 --- a/gnu/packages/docbook.scm +++ b/gnu/packages/docbook.scm @@ -773,18 +773,20 @@ DB2LaTeX.") (sha256 (base32 "1scj5vgw1xz872pq54a89blcxqqm11p90yzv8a9mqq57x27apyj8")) + (patches + (search-patches "docbook-utils-documentation-edits.patch" + "docbook-utils-escape-characters.patch" + "docbook-utils-remove-jade-sp.patch" + "docbook-utils-respect-refentry-for-name.patch" + "docbook-utils-use-date-element.patch" + "docbook-utils-source-date-epoch.patch")) (modules '((guix build utils))) (snippet #~(begin ;; Patch build system. - (substitute* (find-files "." "\\.in$") + (substitute* (find-files "." "\\.(in|am)$") ;; Do not hard-code SGML_CATALOG_FILES. - ((".*SGML_CATALOG_FILES=/etc/sgml/catalog.*") "") - ;; Use OpenSP and OpenJade. - (("\\bjade\\b") - "openjade") - (("\\bnsgmls\\b") - "onsgmls")) + ((".*SGML_CATALOG_FILES=/etc/sgml/catalog.*") "")) ;; Do not override the SGML_CATALOG_FILES environment ;; variable. @@ -804,7 +806,12 @@ DB2LaTeX.") (("CONVERT=/usr/bin/") "CONVERT=") (("\\[ -x /usr/bin/([^ ]+) \\]" _ command) - (format #f "command -v ~a > /dev/null" command))))))) + (format #f "command -v ~a > /dev/null" command))) + + ;; This forces autoreconf to be invoked, needed for patches + ;; to be effective. + (delete-file "configure"))))) + (native-inputs (list autoconf automake libtool)) (build-system gnu-build-system) ;; Propagated for convenience. All these tools are used at run time to ;; provide the complete functionality of the docbook-utils commands. |