From da66bd38572840eb56a11e8cf3093bd811992eb5 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Wed, 26 Jun 2019 18:31:45 +0200 Subject: gnu: libxslt: Fix cross-compilation. * gnu/packages/xml.scm (libxslt)[native-inputs]: Add pkg-config. --- gnu/packages/xml.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b8f3774039..042f06eed3 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -226,6 +226,8 @@ project (but it is usable outside of the Gnome platform).") ("libxml2" ,libxml2) ("python" ,python-minimal-wrapper) ("zlib" ,zlib))) + (native-inputs + `(("pkg-config" ,pkg-config))) (description "Libxslt is an XSLT C library developed for the GNOME project. It is based on libxml for XML parsing, tree manipulation and XPath support.") -- cgit v1.2.3 From 1475554147d8e287afb243912d3cb6e5a3b20baf Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Fri, 5 Jul 2019 17:21:37 +0200 Subject: gnu: xmlto: Fix cross-compilation. * gnu/packages/xml.scm (xmlto)[native-inputs]: Add util-linux. --- gnu/packages/xml.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 042f06eed3..47a7e7b793 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -940,6 +940,8 @@ code for classes that correspond to data structures defined by XMLSchema.") (assoc-ref %build-inputs "util-linux") "/bin/getopt")))) + (native-inputs + `(("util-linux" ,util-linux))) (inputs `(("util-linux" ,util-linux) ; for 'getopt' ("libxml2" ,libxml2) ; for 'xmllint' -- cgit v1.2.3 From 6cd34029c588a5e0d19a77571888968d7acaf0e7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 2 Dec 2019 23:56:25 +0100 Subject: gnu: expat: Remove grafted replacement. * gnu/packages/xml.scm (expat): Update to 2.2.9. [replacement]: Remove. (expat-2.2.9): Remove variable. --- gnu/packages/xml.scm | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 698d1f6188..b3aae8d219 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -66,8 +66,7 @@ (define-public expat (package (name "expat") - (version "2.2.7") - (replacement expat-2.2.9) + (version "2.2.9") (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) (origin (method url-fetch) @@ -79,7 +78,7 @@ "/expat-" version ".tar.xz"))) (sha256 (base32 - "1y5yax6bq8p9xk49zqkd62pxk8bq266wrgbrqgaxp3wsrw5g9qrh"))))) + "1960mmgbb4cm64n1p0nz3hrs1pw03hkrfcw8prmnn4622mdrd9hy"))))) (build-system gnu-build-system) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") @@ -89,23 +88,6 @@ stream-oriented parser in which an application registers handlers for things the parser might find in the XML document (like start tags).") (license license:expat))) -(define expat-2.2.9 - (package - (inherit expat) - (version "2.2.9") - (source (let ((dot->underscore (lambda (c) (if (char=? #\. c) #\_ c)))) - (origin - (method url-fetch) - (uri (list (string-append "mirror://sourceforge/expat/expat/" - version "/expat-" version ".tar.xz") - (string-append - "https://github.com/libexpat/libexpat/releases/download/R_" - (string-map dot->underscore version) - "/expat-" version ".tar.xz"))) - (sha256 - (base32 - "1960mmgbb4cm64n1p0nz3hrs1pw03hkrfcw8prmnn4622mdrd9hy"))))))) - (define-public libebml (package (name "libebml") -- cgit v1.2.3 From 767abd373b595fee5f46189627ea761c9fa555e3 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 05:22:24 +0100 Subject: gnu: expat: Do not build static libraries. * gnu/packages/xml.scm (expat)[arguments]: New field. --- gnu/packages/xml.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index b3aae8d219..d1376a5bee 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -80,6 +80,8 @@ (base32 "1960mmgbb4cm64n1p0nz3hrs1pw03hkrfcw8prmnn4622mdrd9hy"))))) (build-system gnu-build-system) + (arguments + '(#:configure-flags '("--disable-static"))) (home-page "https://libexpat.github.io/") (synopsis "Stream-oriented XML parser library written in C") (description -- cgit v1.2.3 From badcb119c57fe1a6fc617d2f4a237c1192305584 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 2 Dec 2019 22:42:44 +0100 Subject: gnu: libxslt: Update to 1.1.34. * gnu/packages/xml.scm (libxslt): Update to 1.1.34. [arguments]: Add phase to disable fuzz tests. * gnu/packages/patches/libxslt-generated-ids.patch: Adjust for upstream changes. --- gnu/packages/xml.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index d1376a5bee..84066ff5d1 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -212,16 +212,26 @@ project (but it is usable outside of the Gnome platform).") (define-public libxslt (package (name "libxslt") - (version "1.1.33") + (version "1.1.34") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxslt/libxslt-" version ".tar.gz")) (sha256 (base32 - "1j1q1swnsy8jgi9x7mclvkrqhfgn09886gdlr9wzk7a08i8n0dlf")) + "0zrzz6kjdyavspzik6fbkpvfpbd25r2qg6py5nnjaabrsr3bvccq")) (patches (search-patches "libxslt-generated-ids.patch")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-before 'check 'disable-fuzz-tests + (lambda _ + ;; Disable libFuzzer tests, because they require + ;; instrumentation builds of libxml2 and libxslt. + (substitute* "tests/Makefile" + (("exslt plugins fuzz") + "exslt plugins")) + #t))))) (home-page "http://xmlsoft.org/XSLT/index.html") (synopsis "C library for applying XSLT stylesheets to XML documents") (inputs `(("libgcrypt" ,libgcrypt) -- cgit v1.2.3 From c9bba9928aec988b0eaf505ae12042c1200811e9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 3 Dec 2019 13:49:29 +0100 Subject: gnu: libxml2: Update to 2.9.10. * gnu/packages/xml.scm (libxml2): Update to 2.9.10. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 84066ff5d1..cc21d315eb 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -117,14 +117,14 @@ hierarchical form with variable field lengths.") (define-public libxml2 (package (name "libxml2") - (version "2.9.9") + (version "2.9.10") (source (origin (method url-fetch) (uri (string-append "ftp://xmlsoft.org/libxml2/libxml2-" version ".tar.gz")) (sha256 (base32 - "0wd881jzvqayx0ihzba29jl80k06xj9ywp16kxacdqs3064p1ywl")))) + "07xynh8hcxb2yb1fs051xrgszjvj37wnxvxgsj10rzmqzy9y3zma")))) (build-system gnu-build-system) (outputs '("out" "static")) (arguments -- cgit v1.2.3 From 785fcb62fecde1c275fd5bd5da488ef345f456d9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Wed, 4 Dec 2019 23:33:09 +0100 Subject: gnu: Remove python-libxml2 workaround. * gnu/packages/xml.scm (python-libxml2)[source]: New field. (python-libxml2/fixed): Remove variable. * gnu/packages/glib.scm (itstool/fixed): Remove variable. * gnu/packages/gnome.scm (gnumeric)[native-inputs]: Replace ITSTOOL/FIXED with ITSTOOL. (yelp-tools/fixed): Remove variable. * gnu/packages/mate.scm (mate-applets, mate-utils)[native-inputs]: Replace YELP-TOOLS/FIXED with YELP-TOOLS. --- gnu/packages/xml.scm | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index cc21d315eb..6d1aa6f76c 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -166,9 +166,12 @@ project (but it is usable outside of the Gnome platform).") (license license:x11))) (define-public python-libxml2 - ;; TODO: Merge with 'python-libxml2/fixed' on the next rebuild cycle. (package/inherit libxml2 (name "python-libxml2") + (source (origin + (inherit (package-source libxml2)) + (patches (cons (search-patch "python-libxml2-utf8.patch") + (origin-patches (package-source libxml2)))))) (build-system python-build-system) (outputs '("out")) (arguments @@ -194,18 +197,6 @@ project (but it is usable outside of the Gnome platform).") (inputs `(("libxml2" ,libxml2))) (synopsis "Python bindings for the libxml2 library"))) -(define-public python-libxml2/fixed - ;; This variant fixes a crash when processing UTF-8 sequences: - ;; - ;; TODO: Merge with 'python-libxml2' on the next rebuild cycle. - (package/inherit - python-libxml2 - (version (string-append (package-version python-libxml2) "-1")) - (source (origin - (inherit (package-source libxml2)) - (patches (cons (search-patch "python-libxml2-utf8.patch") - (origin-patches (package-source libxml2)))))))) - (define-public python2-libxml2 (package-with-python2 python-libxml2)) -- cgit v1.2.3 From 60825fdd18d56bec0aefd1760bd663f70e7ff1cc Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Mon, 16 Dec 2019 13:39:05 +0100 Subject: gnu: libxslt: Fix cross-compilation. This package native build was relying on xz as an implicit input. In fact libxslt is linking against liblzma, and xz is thus an input. * gnu/packages/xml.scm (libxslt)[inputs]: Add xz. --- gnu/packages/xml.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 86c8eb815f..5ccbc695ea 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -228,7 +228,8 @@ project (but it is usable outside of the Gnome platform).") (inputs `(("libgcrypt" ,libgcrypt) ("libxml2" ,libxml2) ("python" ,python-minimal-wrapper) - ("zlib" ,zlib))) + ("zlib" ,zlib) + ("xz" ,xz))) (native-inputs `(("pkg-config" ,pkg-config))) (description -- cgit v1.2.3 From 8b53495dfb50cda6b2c73b2b49115c184986ccf7 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 17 Mar 2020 11:20:02 +0100 Subject: gnu: perl-xml-parser: Update to 2.46. * gnu/packages/xml.scm (perl-xml-parser): Update to 2.46. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6b68e6f8e0..13c8167be0 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -343,7 +343,7 @@ parsers for it. @code{XML::Descent} allows such parsers to be created.") (define-public perl-xml-parser (package (name "perl-xml-parser") - (version "2.44") + (version "2.46") (source (origin (method url-fetch) (uri (string-append @@ -351,7 +351,7 @@ parsers for it. @code{XML::Descent} allows such parsers to be created.") version ".tar.gz")) (sha256 (base32 - "05ij0g6bfn27iaggxf8nl5rhlwx6f6p6xmdav6rjcly3x5zd1s8s")))) + "0pai3ik47q7rgnix9644c673fwydz52gqkxr9kxwq765j4j36cfk")))) (build-system perl-build-system) (arguments `(#:make-maker-flags (let ((expat (assoc-ref %build-inputs "expat"))) -- cgit v1.2.3 From 447f9acf12bdee3fc817fcbb13fc20180b4ebef9 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 26 Mar 2020 15:48:09 +0100 Subject: gnu: python-xmlschema: Update to 1.1.2. * gnu/packages/xml.scm (python-xmlschema): Update to 1.1.2. --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/xml.scm') diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 5d8d2a30f5..042679e122 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -2099,7 +2099,7 @@ libxml2 and libxslt.") (define-public python-xmlschema (package (name "python-xmlschema") - (version "1.1.1") + (version "1.1.2") (source (origin ;; Unit tests are not distributed with the PyPI archive. (method git-fetch) @@ -2109,7 +2109,7 @@ libxml2 and libxslt.") (file-name (git-file-name name version)) (sha256 (base32 - "0nqhqbvp0kpd1bz11b6gpkc0mkg068mqs56ww4k5ang1cl9d8gd6")))) + "03bz5mp45y4shmlc1gxq1h69vjx60z1acg9cy4kq7fczgx8qg9jw")))) (build-system python-build-system) (arguments '(#:phases -- cgit v1.2.3