summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/engineering.scm2
-rw-r--r--gnu/packages/music.scm2
-rw-r--r--gnu/packages/xml.scm75
3 files changed, 2 insertions, 77 deletions
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index 33c124a2ea5..46622f3a1fe 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -2415,7 +2415,7 @@ comments.")))
2415 ("libtheora" ,libtheora) 2415 ("libtheora" ,libtheora)
2416 ("libtiff" ,libtiff) 2416 ("libtiff" ,libtiff)
2417 ("libxi" ,libxi) 2417 ("libxi" ,libxi)
2418 ("libxmlplusplus" ,libxmlplusplus) 2418 ("libxml++" ,libxml++)
2419 ("libxmu" ,libxmu) 2419 ("libxmu" ,libxmu)
2420 ("lz4" ,lz4) 2420 ("lz4" ,lz4)
2421 ("netcdf" ,netcdf) 2421 ("netcdf" ,netcdf)
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index c1f03863b3a..fcf3c6361a0 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -1895,7 +1895,7 @@ complete studio.")
1895 `(("liblo" ,liblo) 1895 `(("liblo" ,liblo)
1896 ("gtkmm" ,gtkmm) 1896 ("gtkmm" ,gtkmm)
1897 ("alsa-lib" ,alsa-lib) 1897 ("alsa-lib" ,alsa-lib)
1898 ("libxmlplusplus" ,libxmlplusplus-2.6))) 1898 ("libxml++" ,libxml++-2)))
1899 (native-inputs 1899 (native-inputs
1900 `(("glib:bin" ,glib "bin") 1900 `(("glib:bin" ,glib "bin")
1901 ("pkg-config" ,pkg-config))) 1901 ("pkg-config" ,pkg-config)))
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index ed443413d00..8c877603236 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -294,81 +294,6 @@ formulas and hyperlinks to multiple worksheets in an Excel 2007+ XLSX file.")
294 (license (list license:bsd-2 294 (license (list license:bsd-2
295 license:public-domain)))) ; third_party/md5 295 license:public-domain)))) ; third_party/md5
296 296
297;; This is the latest stable release.
298(define-public libxmlplusplus
299 (package
300 (name "libxmlplusplus")
301 (version "3.2.0")
302 (source (origin
303 (method git-fetch)
304 (uri (git-reference
305 (url "https://github.com/libxmlplusplus/libxmlplusplus")
306 (commit version)))
307 (file-name (git-file-name name version))
308 (sha256
309 (base32
310 "0wjz591rjlgbah7dcq8i0yn0zw9d62b7g6r0pppx81ic0cx8n8ga"))))
311 (build-system gnu-build-system)
312 (arguments
313 `(#:phases
314 (modify-phases %standard-phases
315 (add-after 'unpack 'fix-documentation
316 (lambda* (#:key inputs #:allow-other-keys)
317 (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml")
318 "/xml/dtd/docbook"))
319 (xsldoc (string-append (assoc-ref inputs "docbook-xsl")
320 "/xml/xsl/docbook-xsl-"
321 ,(package-version docbook-xsl))))
322 (substitute* '("examples/dom_xpath/example.xml"
323 "docs/manual/libxml++_without_code.xml")
324 (("http://.*/docbookx\\.dtd")
325 (string-append xmldoc "/docbookx.dtd")))
326 (setenv "SGML_CATALOG_FILES"
327 (string-append xmldoc "/catalog.xml"))
328 (substitute* "docs/manual/docbook-customisation.xsl"
329 (("http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl")
330 (string-append xsldoc "/html/chunk.xsl"))))
331 #t)))))
332 (propagated-inputs
333 `(("libxml2" ,libxml2)))
334 (inputs
335 `(("glibmm" ,glibmm)))
336 (native-inputs
337 `(("autoconf" ,autoconf)
338 ("automake" ,automake)
339 ("doxygen" ,doxygen)
340 ("docbook-xml" ,docbook-xml)
341 ("docbook-xsl" ,docbook-xsl)
342 ("graphviz" ,graphviz) ; for dot
343 ("libtool" ,libtool)
344 ("libxslt" ,libxslt)
345 ("mm-common" ,mm-common)
346 ("perl" ,perl)
347 ("pkg-config" ,pkg-config)))
348 (home-page "https://github.com/libxmlplusplus/libxmlplusplus/")
349 (synopsis "C++ bindings for libxml2")
350 (description
351 "libxml++ (a.k.a. libxmlplusplus) provides a C++ interface to XML files.
352It uses libxml2 to access the XML files.")
353 (license license:lgpl2.1+)))
354
355;; This is the last release providing the 2.6 API, hence the name.
356;; This is needed by tascam-gtk
357(define-public libxmlplusplus-2.6
358 (package
359 (inherit libxmlplusplus)
360 (name "libxmlplusplus")
361 (version "2.40.1")
362 (source (origin
363 (method git-fetch)
364 (uri (git-reference
365 (url "https://github.com/libxmlplusplus/libxmlplusplus")
366 (commit version)))
367 (file-name (git-file-name name version))
368 (sha256
369 (base32
370 "0gbfi4l88w828gmyc9br11l003ylyi4vigp5d1kfgsn0k4cig3y9"))))))
371
372(define-public python-libxml2 297(define-public python-libxml2
373 (package/inherit libxml2 298 (package/inherit libxml2
374 (name "python-libxml2") 299 (name "python-libxml2")