[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
305/402: gnu: Add liblouisutdml.
From: |
guix-commits |
Subject: |
305/402: gnu: Add liblouisutdml. |
Date: |
Tue, 18 Aug 2020 16:48:09 -0400 (EDT) |
dannym pushed a commit to branch wip-desktop
in repository guix.
commit 40d218b419c273236aa38436ac419807eb8e3ab6
Author: Raghav Gururajan <raghavgururajan@disroot.org>
AuthorDate: Fri Aug 7 17:08:33 2020 -0400
gnu: Add liblouisutdml.
* gnu/packages/language.scm (liblouisutdml): New variable.
* gnu/packages/patches/liblouisutdml-fix-tests.patch: New file.
* gnu/local.mk (liblouisutdml-fix-tests.patch): New reference.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
---
gnu/local.mk | 1 +
gnu/packages/language.scm | 52 +++++++++++++++++++++-
gnu/packages/patches/liblouisutdml-fix-tests.patch | 33 ++++++++++++++
3 files changed, 85 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a699392..534cf26 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1218,6 +1218,7 @@ 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 771df61..4959f96 100644
--- a/gnu/packages/language.scm
+++ b/gnu/packages/language.scm
@@ -25,6 +25,7 @@
#:use-module (gnu packages autotools)
#:use-module (gnu packages glib)
#:use-module (gnu packages gtk)
+ #:use-module (gnu packages java)
#:use-module (gnu packages llvm)
#:use-module (gnu packages man)
#:use-module (gnu packages ocr)
@@ -35,6 +36,7 @@
#:use-module (gnu packages swig)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages web)
+ #:use-module (gnu packages xml)
#:use-module (gnu packages xorg)
#:use-module (guix packages)
#:use-module (guix build-system gnu)
@@ -42,7 +44,7 @@
#:use-module (guix build-system python)
#:use-module ((guix licenses)
#:select
- (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ perl-license
zpl2.1))
+ (bsd-3 gpl2 gpl2+ gpl3 gpl3+ lgpl2.1 lgpl2.1+ lgpl3+
perl-license zpl2.1))
#:use-module (guix download)
#:use-module (guix git-download)
#:use-module (guix utils))
@@ -105,6 +107,54 @@ Marburg.")
;; Tools
gpl3+))))
+(define-public liblouisutdml
+ (package
+ (name "liblouisutdml")
+ (version "2.8.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri
+ (git-reference
+ (url "https://github.com/liblouis/liblouisutdml.git")
+ (commit (string-append "v" version))))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "11xxky3crjm8bidfljzpqaz1m1i1m1yskmdpavf9b4jpf87nzjj2"))
+ (patches
+ (search-patches "liblouisutdml-fix-tests.patch"))))
+ (build-system gnu-build-system)
+ (outputs '("out" "bin" "doc"))
+ (arguments
+ `(#:configure-flags
+ (list
+ "--disable-static")))
+ (native-inputs
+ `(("autoconf" ,autoconf)
+ ("automake" ,automake)
+ ("help2man" ,help2man)
+ ("jdk" ,icedtea "jdk")
+ ("libtool" ,libtool)
+ ("makeinfo" ,texinfo)
+ ("pkg-config" ,pkg-config)))
+ (inputs
+ `(("libxml2" ,libxml2)))
+ (propagated-inputs
+ `(("liblouis" ,liblouis)
+ ("liblouis:bin" ,liblouis "bin")))
+ (synopsis "Braille transcription services")
+ (description "Liblouisutdml is a library providing complete braille
+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+))))
+
(define-public libstemmer
(package
(name "libstemmer")
diff --git a/gnu/packages/patches/liblouisutdml-fix-tests.patch
b/gnu/packages/patches/liblouisutdml-fix-tests.patch
new file mode 100644
index 0000000..08d3db2
--- /dev/null
+++ b/gnu/packages/patches/liblouisutdml-fix-tests.patch
@@ -0,0 +1,33 @@
+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 \
- 276/402: gnu: rust-serial-test-derive@0.4.0: Fix reference to rust-syn., (continued)
- 276/402: gnu: rust-serial-test-derive@0.4.0: Fix reference to rust-syn., guix-commits, 2020/08/18
- 277/402: gnu: rust-rgb@0.8.20: Fix references to rust-bytemuck, rust-serde, rust-serde-json., guix-commits, 2020/08/18
- 279/402: gnu: gnome-desktop: Update package definition., guix-commits, 2020/08/18
- 282/402: gnu: gnome-getting-started-docs: Update package definition., guix-commits, 2020/08/18
- 283/402: gnu: Add fuse@2.9.9., guix-commits, 2020/08/18
- 286/402: gnu: malcontent: Update package definition., guix-commits, 2020/08/18
- 291/402: gnu: gnome-music: Update package definition., guix-commits, 2020/08/18
- 293/402: gnu: gnome-screenshot: Update package definition., guix-commits, 2020/08/18
- 296/402: gnu: gnome-shell-extensions: Update package definition., guix-commits, 2020/08/18
- 304/402: gnu: Add liblouis., guix-commits, 2020/08/18
- 305/402: gnu: Add liblouisutdml.,
guix-commits <=
- 306/402: gnu: Add latex2html., guix-commits, 2020/08/18
- 310/402: gnu: gst-editing-services: Update package definition., guix-commits, 2020/08/18
- 315/402: gnu: totem: Update package definition., guix-commits, 2020/08/18
- 313/402: gnu: libmusicbrainz: Propagate inputs., guix-commits, 2020/08/18
- 316/402: gnu: wayland: Update package definition., guix-commits, 2020/08/18
- 324/402: gnu: gnome-shell: Update package definition., guix-commits, 2020/08/18
- 320/402: gnu: Add mozjs-68., guix-commits, 2020/08/18
- 312/402: gnu: simple-scan: Update package definition., guix-commits, 2020/08/18
- 319/402: gnu: Add egl-wayland., guix-commits, 2020/08/18
- 317/402: gnu: wayland-protocols: Update package definition., guix-commits, 2020/08/18