me
/
guix
Archived
1
0
Fork 0
Code

gnu: opensp: Remove patch-docbook-xml phase. 

* gnu/packages/xml.scm (opensp) [arguments]: Remove patch-docbook-xml
phase.  Use gexps.
[native-inputs]: Remove labels.
master
Maxim Cournoyer 2023-04-20 16:18:14 -04:00
parent b42acd88d4
commit b84d0b81b2
No known key found for this signature in database
GPG Key ID: 1260E46482E63562
1 changed files with 39 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
gnu/packages/xml.scm
View File

@ -27,7 +27,7 @@
;;; Copyright © 2020 Brett Gilio <brettg@gnu.org> ;;; Copyright © 2020 Brett Gilio <brettg@gnu.org>
;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com> ;;; Copyright © 2020 Pierre Langlois <pierre.langlois@gmx.com>
;;; Copyright © 2021 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2021 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2021, 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021, 2022, 2023 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu> ;;; Copyright © 2021 Julien Lepiller <julien@lepiller.eu>
;;; Copyright © 2021 Felix Gruber <felgru@posteo.net> ;;; Copyright © 2021 Felix Gruber <felgru@posteo.net>
;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net> ;;; Copyright © 2021 Guillaume Le Vaillant <glv@posteo.net>
@ -1741,49 +1741,36 @@ modular implementation of XML-RPC for C and C++.")
(outputs '("out" "doc")) (outputs '("out" "doc"))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs
`(("docbook-xml" ,docbook-xml-4.1.2) (list docbook-xml-4.1.2
("docbook-xsl" ,docbook-xsl) docbook-xsl
("libxml2" ,libxml2) ;for XML_CATALOG_DIR libxml2 ;for XML_CATALOG_DIR
("xmlto" ,xmlto) xmlto
;; Dependencies to regenerate the 'configure' script. ;; Dependencies to regenerate the 'configure' script.
("autoconf" ,autoconf) autoconf
("automake" ,automake) automake
("gettext" ,gettext-minimal) gettext-minimal
("libtool" ,libtool))) libtool))
(arguments (arguments
`( ;; Note: we cannot use '--enable-full-doc-build' as this would require (list
;; Note: we cannot use '--enable-full-doc-build' as this would require
;; Openjade, which in turn requires this package. ;; Openjade, which in turn requires this package.
;; Skip the tests that are known to fail (see: ;; Skip the tests that are known to fail (see:
;; https://sourceforge.net/p/openjade/mailman/message/6182316/) ;; https://sourceforge.net/p/openjade/mailman/message/6182316/)
#:make-flags '("TESTS_THAT_FAIL=") #:make-flags '("TESTS_THAT_FAIL=")
#:phases #:phases
(modify-phases %standard-phases #~(modify-phases %standard-phases
(add-after 'unpack 'patch-docbook-paths (add-after 'unpack 'delete-configure
(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))))
(substitute* (find-files "docsrc" "\\.xml$")
(("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc)
(("http://.*/docbookx\\.dtd")
(string-append xmldoc "/docbookx.dtd")))
#t)))
(add-after 'patch-docbook-paths 'delete-configure
;; The configure script in the release was made with an older ;; The configure script in the release was made with an older
;; Autoconf and lacks support for the `--docdir' option. ;; Autoconf and lacks support for the `--docdir' option.
(lambda _ (lambda _
(delete-file "configure") (delete-file "configure")))
#t))
(add-after 'delete-configure 'honor-docdir (add-after 'delete-configure 'honor-docdir
;; docdir is not honored due to being hardcoded in the various ;; docdir is not honored due to being hardcoded in the various
;; Makefile.am (see: https://sourceforge.net/p/openjade/bugs/147/). ;; Makefile.am (see: https://sourceforge.net/p/openjade/bugs/147/).
(lambda _ (lambda _
(substitute* '("Makefile.am" "doc/Makefile.am" "docsrc/Makefile.am") (substitute* '("Makefile.am" "doc/Makefile.am" "docsrc/Makefile.am")
(("^docdir = .*") "docdir = @docdir@\n")) (("^docdir = .*") "docdir = @docdir@\n"))))
#t))
(add-after 'delete-configure 'fix-tests-makefile.am (add-after 'delete-configure 'fix-tests-makefile.am
;; Remove the trailing $(SHELL) from the TESTS_ENVIRONMENT variable ;; Remove the trailing $(SHELL) from the TESTS_ENVIRONMENT variable
;; definition. Otherwise, when targets are built using ;; definition. Otherwise, when targets are built using
@ -1793,8 +1780,7 @@ modular implementation of XML-RPC for C and C++.")
(substitute* "tests/Makefile.am" (substitute* "tests/Makefile.am"
(("^\tOSGMLNORM=`echo osgmlnorm\\|sed '\\$\\(transform\\)'`\\\\") (("^\tOSGMLNORM=`echo osgmlnorm\\|sed '\\$\\(transform\\)'`\\\\")
"\tOSGMLNORM=`echo osgmlnorm|sed '$(transform)'`") "\tOSGMLNORM=`echo osgmlnorm|sed '$(transform)'`")
(("^\t\\$\\(SHELL\\)\n") "")) (("^\t\\$\\(SHELL\\)\n") "")))))))
#t)))))
;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found
;; under the 'sgml' sub-directory of any given package. ;; under the 'sgml' sub-directory of any given package.
(native-search-paths (list (search-path-specification (native-search-paths (list (search-path-specification