From c577b3062a075e732c70f8d50d8d706d56aefba5 Mon Sep 17 00:00:00 2001 From: Michael Rohleder Date: Mon, 11 Jan 2021 23:39:29 +0100 Subject: gnu: libebml: Update to 1.4.1. * gnu/packages/xml.scm (libebml): Update to 1.4.1. Signed-off-by: Nicolas Goaziou --- gnu/packages/xml.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 163fff60c0..9816802b64 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -26,6 +26,7 @@ ;;; Copyright © 2020 Edouard Klein ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Pierre Langlois +;;; Copyright © 2021 Michael Rohleder ;;; ;;; This file is part of GNU Guix. ;;; @@ -139,14 +140,14 @@ things the parser might find in the XML document (like start tags).") (define-public libebml (package (name "libebml") - (version "1.4.0") + (version "1.4.1") (source (origin (method url-fetch) (uri (string-append "https://dl.matroska.org/downloads/libebml/" "libebml-" version ".tar.xz")) (sha256 - (base32 "1cy4hbk8qbxn4c6pwvlsvr1rp8vhfach9rwfg4c50qa94nlckaw0")))) + (base32 "0ckhf7wcfwik1c8ilwipdr9p7b58pvqvj8x54l6slqah81lwd53f")))) (build-system cmake-build-system) (arguments `(#:configure-flags -- cgit 1.4.1 From a34eafce27de768308769f2e894e8d40decb3884 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 28 Dec 2020 11:29:36 -0500 Subject: gnu: opensp: Move package to (gnu packages xml). * gnu/packages/finance.scm (opensp): Move to... * gnu/packages/xml.scm (opensp): ... here. --- gnu/packages/finance.scm | 50 ----------------------------------------------- gnu/packages/xml.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 50 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e7d58bbcc0..8ead37beb3 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm @@ -1380,56 +1380,6 @@ following three utilities are included with the library: @end enumerate") (license license:gpl2+))) -(define-public opensp - (package - (name "opensp") - (version "1.5.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://sourceforge/openjade/opensp/" - version "/OpenSP-" version ".tar.gz")) - (sha256 - (base32 - "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p")))) - (build-system gnu-build-system) - (native-inputs - `(("gettext" ,gettext-minimal))) - (inputs - `(("docbook-xml" ,docbook-xml-4.1.2) - ("docbook-xsl" ,docbook-xsl) - ("xmlto" ,xmlto))) - (arguments - `(;; TODO: Fix and enable tests. - #:tests? #f - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-docbook-paths - (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"))) - ;; Directly pass the path to the stylesheet to xmlto. - (substitute* "docsrc/Makefile.in" - (("\\$\\(XMLTO\\)") - (string-append "$(XMLTO) -x " xsldoc - "/manpages/docbook.xsl"))) - #t)))))) - (home-page "http://openjade.sourceforge.net/") - (synopsis "Suite of SGML/XML processing tools") - (description "OpenSP is an object-oriented toolkit for SGML parsing and -entity management.") - (license - ;; expat license with added clause regarding advertising - (license:non-copyleft - "file://COPYING" - "See COPYING in the distribution.")))) - (define-public bitcoin-unlimited (package (name "bitcoin-unlimited") diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 9816802b64..5594a55f06 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -52,6 +52,7 @@ #:use-module (gnu packages curl) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) + #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) @@ -2208,6 +2209,56 @@ server using HTTP, and gets back the response as XML. This library provides a modular implementation of XML-RPC for C and C++.") (license (list license:psfl license:expat)))) +(define-public opensp + (package + (name "opensp") + (version "1.5.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/openjade/opensp/" + version "/OpenSP-" version ".tar.gz")) + (sha256 + (base32 + "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p")))) + (build-system gnu-build-system) + (native-inputs + `(("gettext" ,gettext-minimal))) + (inputs + `(("docbook-xml" ,docbook-xml-4.1.2) + ("docbook-xsl" ,docbook-xsl) + ("xmlto" ,xmlto))) + (arguments + `(;; TODO: Fix and enable tests. + #:tests? #f + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-paths + (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"))) + ;; Directly pass the path to the stylesheet to xmlto. + (substitute* "docsrc/Makefile.in" + (("\\$\\(XMLTO\\)") + (string-append "$(XMLTO) -x " xsldoc + "/manpages/docbook.xsl"))) + #t)))))) + (home-page "http://openjade.sourceforge.net/") + (synopsis "Suite of SGML/XML processing tools") + (description "OpenSP is an object-oriented toolkit for SGML parsing and +entity management.") + (license + ;; expat license with added clause regarding advertising + (license:non-copyleft + "file://COPYING" + "See COPYING in the distribution.")))) + (define-public python-elementpath (package (name "python-elementpath") -- cgit 1.4.1 From de99dc48248d2249f06b7a19553247ea38d09909 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 28 Dec 2020 14:01:47 -0500 Subject: gnu: opensp: Add doc output, enable tests and add search path. * gnu/packages/xml.scm (opensp)[outputs]: Add doc output. [inputs]: Move to... [native-inputs]: ... here. Add autoconf, automake, gettext and libtool and libxml2. [arguments]: Enable tests. {make-flags}: New argument. [phases]{patch-docbook-paths}: No longer patch XMLTO command line. {delete-configure, honor-docdir, fix-tests-makefile.am}: New phases. [native-search-paths]: Define a SGML_CATALOG_FILES search path specification. [description]: Extend description. --- gnu/packages/xml.scm | 64 ++++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 12 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5594a55f06..6208f7826b 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -27,6 +27,7 @@ ;;; Copyright © 2020 Brett Gilio ;;; Copyright © 2020 Pierre Langlois ;;; Copyright © 2021 Michael Rohleder +;;; Copyright © 2021 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -2220,16 +2221,25 @@ modular implementation of XML-RPC for C and C++.") (sha256 (base32 "1khpasr6l0a8nfz6kcf3s81vgdab8fm2dj291n5r2s53k228kx2p")))) + (outputs '("out" "doc")) (build-system gnu-build-system) (native-inputs - `(("gettext" ,gettext-minimal))) - (inputs `(("docbook-xml" ,docbook-xml-4.1.2) ("docbook-xsl" ,docbook-xsl) - ("xmlto" ,xmlto))) + ("libxml2" ,libxml2) ;for XML_CATALOG_DIR + ("xmlto" ,xmlto) + ;; Dependencies to regenerate the 'configure' script. + ("autoconf" ,autoconf) + ("automake" ,automake) + ("gettext" ,gettext-minimal) + ("libtool" ,libtool))) (arguments - `(;; TODO: Fix and enable tests. - #:tests? #f + `( ;; Note: we cannot use '--enable-full-doc-build' as this would require + ;; Openjade, which in turn requires this package. + + ;; Skip the tests that are known to fail (see: + ;; https://sourceforge.net/p/openjade/mailman/message/6182316/) + #:make-flags '("TESTS_THAT_FAIL=") #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-docbook-paths @@ -2243,16 +2253,46 @@ modular implementation of XML-RPC for C and C++.") (("/usr/share/sgml/docbook/xml-dtd-4.1.2") xmldoc) (("http://.*/docbookx\\.dtd") (string-append xmldoc "/docbookx.dtd"))) - ;; Directly pass the path to the stylesheet to xmlto. - (substitute* "docsrc/Makefile.in" - (("\\$\\(XMLTO\\)") - (string-append "$(XMLTO) -x " xsldoc - "/manpages/docbook.xsl"))) - #t)))))) + #t))) + (add-after 'patch-docbook-paths 'delete-configure + ;; The configure script in the release was made with an older + ;; Autoconf and lacks support for the `--docdir' option. + (lambda _ + (delete-file "configure") + #t)) + (add-after 'delete-configure 'honor-docdir + ;; docdir is not honored due to being hardcoded in the various + ;; Makefile.am (see: https://sourceforge.net/p/openjade/bugs/147/). + (lambda _ + (substitute* '("Makefile.am" "doc/Makefile.am" "docsrc/Makefile.am") + (("^docdir = .*") "docdir = @docdir@\n")) + #t)) + (add-after 'delete-configure 'fix-tests-makefile.am + ;; Remove the trailing $(SHELL) from the TESTS_ENVIRONMENT variable + ;; definition. Otherwise, when targets are built using + ;; "$(am__check_pre) $(LOG_DRIVER) [...]", there would be two + ;; $(SHELL) expansion which fails the build. + (lambda _ + (substitute* "tests/Makefile.am" + (("^\tOSGMLNORM=`echo osgmlnorm\\|sed '\\$\\(transform\\)'`\\\\") + "\tOSGMLNORM=`echo osgmlnorm|sed '$(transform)'`") + (("^\t\\$\\(SHELL\\)\n") "")) + #t))))) + ;; $SGML_CATALOG_FILES lists 'catalog' or 'CATALOG' or '*.cat' files found + ;; under the 'sgml' sub-directory of any given package. + (native-search-paths (list (search-path-specification + (variable "SGML_CATALOG_FILES") + (separator ":") + (files '("sgml")) + (file-pattern "^catalog$|^CATALOG$|^.*\\.cat$") + (file-type 'regular)))) (home-page "http://openjade.sourceforge.net/") (synopsis "Suite of SGML/XML processing tools") (description "OpenSP is an object-oriented toolkit for SGML parsing and -entity management.") +entity management. It is a fork of James Clark's SP suite. The tools it +contains can be used to parse, validate, and normalize SGML and XML files. +The central program included in this package is @code{onsgmls}, which replaces +@code{sgmls}, @code{ospam}, @code{ospent}, @code{osgmlnorm}, and @code{osx}.") (license ;; expat license with added clause regarding advertising (license:non-copyleft -- cgit 1.4.1 From 1729fb52abac16433c5ee07f202a71d3b64ed94e Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 2 Jul 2018 11:51:36 -0400 Subject: gnu: Add openjade. * gnu/packages/xml.scm (openjade): New variable. --- gnu/packages/xml.scm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6208f7826b..930cd795f5 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -361,6 +361,86 @@ It uses libxml2 to access the XML files.") based on libxml for XML parsing, tree manipulation and XPath support.") (license license:x11))) +(define-public openjade + (package + (name "openjade") + (version "1.3.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://sourceforge/openjade/openjade/" + version "/" name "-" version ".tar.gz")) + (sha256 + (base32 + "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x")))) + (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list (string-append "--enable-spincludedir=" + (assoc-ref %build-inputs "opensp") + "/include/OpenSP") + (string-append "--enable-splibdir=" + (assoc-ref %build-inputs "opensp") "/lib") + ;; Workaround segfaults in OpenJade (see: + ;; https://bugs.launchpad.net/ubuntu/+source/openjade/+bug/1869734). + "CXXFLAGS=-O0") + #:parallel-build? #f ;build fails otherwise + ;; The test suite fails with diff errors between the actual and + ;; expected results, like: (char