diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-10-02 18:19:33 +0200 |
|---|---|---|
| committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2020-10-02 23:08:10 +0200 |
| commit | 433b391f9e4d7aaff3e808721b670828759cbb1a (patch) | |
| tree | a614eb172ee7ce79e212dd2001b342a17b6f705d | |
| parent | b4fb61f60bbd1b53e3ac0206f810d9a2ed179cfd (diff) | |
| download | guix-433b391f9e4d7aaff3e808721b670828759cbb1a.tar.gz | |
gnu: liblouisutdml: Update to 2.9.0.
* gnu/packages/language.scm (liblouisutdml): Update to 2.9.0. [source]: Remove patch. * gnu/packages/patches/liblouisutdml-fix-tests.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove it.
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/language.scm | 17 | ||||
| -rw-r--r-- | gnu/packages/patches/liblouisutdml-fix-tests.patch | 33 |
3 files changed, 5 insertions, 46 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index f2b7a5da84..3633eeb480 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1231,7 +1231,6 @@ dist_patch_DATA = \ %D%/packages/patches/libgnomeui-utf8.patch \ %D%/packages/patches/libjxr-fix-function-signature.patch \ %D%/packages/patches/libjxr-fix-typos.patch \ - %D%/packages/patches/liblouisutdml-fix-tests.patch \ %D%/packages/patches/libofa-ftbfs-1.diff \ %D%/packages/patches/libofa-curl.diff \ %D%/packages/patches/libofa-ftbfs-2.diff \ diff --git a/gnu/packages/language.scm b/gnu/packages/language.scm index 090d18d7b7..8961cf98c0 100644 --- a/gnu/packages/language.scm +++ b/gnu/packages/language.scm @@ -109,7 +109,7 @@ Marburg.") (define-public liblouisutdml (package (name "liblouisutdml") - (version "2.8.0") + (version "2.9.0") (source (origin (method git-fetch) @@ -119,15 +119,12 @@ Marburg.") (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "11xxky3crjm8bidfljzpqaz1m1i1m1yskmdpavf9b4jpf87nzjj2")) - (patches - (search-patches "liblouisutdml-fix-tests.patch")))) + (base32 "0c32cfcfp0lyfd655c9ihhh3p7lhrb9q3xbll7q5dw4km86gaq6w")))) (build-system gnu-build-system) (outputs '("out" "bin" "doc")) (arguments `(#:configure-flags - (list - "--disable-static"))) + (list "--disable-static"))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) @@ -147,12 +144,8 @@ transcription services for xml, html and text documents. It translates into appropriate braille codes and formats according to its style sheet and the specifications in the document.") (home-page "http://liblouis.org/") - (license - (list - ;; Library - lgpl3+ - ;; Tools - gpl3+)))) + (license (list lgpl3+ ; library + gpl3+)))) ; tools (define-public libstemmer (package diff --git a/gnu/packages/patches/liblouisutdml-fix-tests.patch b/gnu/packages/patches/liblouisutdml-fix-tests.patch deleted file mode 100644 index 08d3db2c21..0000000000 --- a/gnu/packages/patches/liblouisutdml-fix-tests.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 52d44cdbc307d4e2ffc3ebe674745eb9d43ec337 Mon Sep 17 00:00:00 2001 -From: Christian Egli <christian.egli@sbs.ch> -Date: Mon, 10 Aug 2020 16:08:17 +0200 -Subject: [PATCH] Some math over and under tests now actually pass - -with the newest liblouis ---- - tests/Makefile.am | 5 ----- - 1 file changed, 5 deletions(-) - -diff --git a/tests/Makefile.am b/tests/Makefile.am -index 157b005..932a5d0 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -321,10 +321,6 @@ XFAIL_TESTS += \ - mathml_nemeth/mover_06.test \ - mathml_nemeth/mover_07.test \ - mathml_nemeth/mover_08.test \ -- mathml_nemeth/mover_09.test \ -- mathml_nemeth/mover_10.test \ -- mathml_nemeth/mover_11.test \ -- mathml_nemeth/mover_12.test \ - mathml_nemeth/mover_13.test \ - mathml_nemeth/mover_14.test \ - mathml_nemeth/mover_15.test \ -@@ -332,7 +328,6 @@ XFAIL_TESTS += \ - mathml_nemeth/munder_01.test \ - mathml_nemeth/munder_02.test \ - mathml_nemeth/munder_03.test \ -- mathml_nemeth/munder_04.test \ - mathml_nemeth/munder_05.test \ - mathml_nemeth/munder_06.test \ - mathml_nemeth/munder_07.test \ |