[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug#35446] [PATCH v2 06/24] gnu: calibre: Move font unbundling to after

From: Brendan Tildesley
Subject: [bug#35446] [PATCH v2 06/24] gnu: calibre: Move font unbundling to after check phase.
Date: Sat, 4 May 2019 02:42:14 +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
  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 f2875ef2fc..007ca9fc47 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -95,14 +95,12 @@
             (delete-file "src/odf/")
-            (delete-file-recursively "resources/fonts/liberation")
         (patches (search-patches "calibre-no-updates-dialog.patch"
     (build-system python-build-system)
      `(("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 @@
      `(("chmlib" ,chmlib)
        ("fontconfig" ,fontconfig)
+       ("font-liberation" ,font-liberation)
        ("glib" ,glib)
        ("icu4c" ,icu4c)
        ("js-mathjax" ,js-mathjax)
@@ -191,17 +190,18 @@
              (invoke "python2" "" "mathjax""--system-mathjax" 
                      (string-append (assoc-ref inputs "js-mathjax") 
              (invoke "python2" "" "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")
-                       (find-files (string-append
-                                    (assoc-ref inputs "font-liberation")
-                                    "/share/fonts/truetype")))
+             (let ((font-dest (string-append (assoc-ref outputs "out")
+                   (font-src (string-append (assoc-ref inputs 
+                                            "/share/fonts/truetype")))
+               (delete-file-recursively font-dest)
+               (symlink font-src font-dest))
-         (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")

reply via email to

[Prev in Thread] Current Thread [Next in Thread]