[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#35446] [PATCH 13/26] gnu: calibre: Move font unbundling to after ch
From: |
Brendan Tildesley |
Subject: |
[bug#35446] [PATCH 13/26] gnu: calibre: Move font unbundling to after check phase. |
Date: |
Sat, 27 Apr 2019 19:36:46 +1000 |
* gnu/packagse/ebook.scm (calibre): Move font unbundling to after check
phase. Some of the tests use the font files for various things. It's more
convenient to just allow the font files to be there than to patche the
tests.
We also take the chance to switch from copying the font files in, to having
font-liberation as an input and symlinking them.
---
gnu/packages/ebook.scm | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 1726f83093..e24d2ac2b9 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -95,14 +95,12 @@
(snippet
'(begin
(delete-file "src/odf/thumbnail.py")
- (delete-file-recursively "resources/fonts/liberation")
#t))
(patches (search-patches "calibre-no-updates-dialog.patch"
"calibre-remove-test-unrar.patch"))))
(build-system python-build-system)
(native-inputs
`(("pkg-config" ,pkg-config)
- ("font-liberation" ,font-liberation)
("qtbase" ,qtbase) ; for qmake
;; xdg-utils is supposed to be used for desktop integration, but it
;; also creates lots of messages
@@ -113,6 +111,7 @@
(inputs
`(("chmlib" ,chmlib)
("fontconfig" ,fontconfig)
+ ("font-liberation" ,font-liberation)
("glib" ,glib)
("icu4c" ,icu4c)
("js-mathjax" ,js-mathjax)
@@ -189,17 +188,18 @@
(invoke "python2" "setup.py" "mathjax""--system-mathjax"
"--path-to-mathjax"
(string-append (assoc-ref inputs "js-mathjax")
"/share/javascript/mathjax"))
(invoke "python2" "setup.py" "rapydscript")))
- (add-after 'install 'install-font-liberation
+ ;; The font TTF files are used in some miscellaneous tests, so we
+ ;; unbundle them here to avoid patching the tests.
+ (add-after 'install 'unbundle-font-liberation
(lambda* (#:key inputs outputs #:allow-other-keys)
- (for-each (lambda (file)
- (install-file file (string-append
- (assoc-ref outputs "out")
-
"/share/calibre/fonts/liberation")))
- (find-files (string-append
- (assoc-ref inputs "font-liberation")
- "/share/fonts/truetype")))
+ (let ((font-dest (string-append (assoc-ref outputs "out")
+
"/share/calibre/fonts/liberation"))
+ (font-src (string-append (assoc-ref inputs
"font-liberation")
+ "/share/fonts/truetype")))
+ (delete-file-recursively font-dest)
+ (symlink font-src font-dest))
#t))
- (add-after 'install-font-liberation 'install-mimetypes
+ (add-after 'unbundle-font-liberation 'install-mimetypes
(lambda* (#:key outputs #:allow-other-keys)
(install-file "resources/calibre-mimetypes.xml"
(string-append (assoc-ref outputs "out")
--
2.21.0
- [bug#35446] [PATCH 0/26] Calibre: Update to 3.41.3, Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 25/26]: gnu: calibre: Delete various junk from source. (fix typos), Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 01/26] gnu: Use 'license:' prefix in (gnu packages web)., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 14/26] gnu: Add python-html2text, python2-html2text., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 16/26] gnu: python-regex, python2-regex: Update to 2019.04.14., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 25/26] gnu: calibre: Remove libxrender as an input., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 22/26] gnu: calibre: Disable bs4 test., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 02/26] gnu: Add python-css-parser, python2-css-parser., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 13/26] gnu: calibre: Move font unbundling to after check phase.,
Brendan Tildesley <=
- [bug#35446] [PATCH 21/26] gnu: calibre: Disable Qt test., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 11/26] gnu: calibre: Add missing dependencies as indicated by tests., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 17/26] gnu: calibre: Disable tests that require networking., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 20/26] gnu: calibre: Disable bs4 test., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 19/26] gnu: calibre: Use linux.py to install desktop files., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 05/26] Update email address for Brendan Tildesley, Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 07/26] gnu: calibre: Remove markdown unbundling code., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 03/26] gnu: calibre: Update to 3.41.3., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 10/26] gnu: calibre: Enable tests., Brendan Tildesley, 2019/04/27
- [bug#35446] [PATCH 15/26] gnu: calibre: Add python2-html2text as an input., Brendan Tildesley, 2019/04/27