unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Brendan Tildesley <mail@brendan.scot>
To: 35446@debbugs.gnu.org
Subject: [bug#35446] [PATCH 13/26] gnu: calibre: Move font unbundling to after check phase.
Date: Sat, 27 Apr 2019 19:36:46 +1000	[thread overview]
Message-ID: <20190427093659.21851-13-mail@brendan.scot> (raw)
In-Reply-To: <20190427093659.21851-1-mail@brendan.scot>

* 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

  parent reply	other threads:[~2019-04-27  9:38 UTC|newest]

Thread overview: 59+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-27  6:36 [bug#35446] [PATCH 0/26] Calibre: Update to 3.41.3 Brendan Tildesley
2019-04-27  9:36 ` [bug#35446] [PATCH 01/26] gnu: Use 'license:' prefix in (gnu packages web) Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 02/26] gnu: Add python-css-parser, python2-css-parser Brendan Tildesley
2019-05-03 11:48     ` Andreas Enge
2019-04-27  9:36   ` [bug#35446] [PATCH 03/26] gnu: calibre: Update to 3.41.3 Brendan Tildesley
2019-05-03 11:57     ` Andreas Enge
2019-05-03 16:49       ` Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 04/26] gnu: calibre: Remove feedparser patch Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 05/26] Update email address for Brendan Tildesley Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 06/26] gnu: calibre: [inputs]: Replace cssutils with the css-parser fork Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 07/26] gnu: calibre: Remove markdown unbundling code Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 08/26] gnu: calibre: Use system mathjax Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 09/26] gnu: calibre: Build rapydscript Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 10/26] gnu: calibre: Enable tests Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 11/26] gnu: calibre: Add missing dependencies as indicated by tests Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 12/26] gnu: calibre: Patch out unrar test Brendan Tildesley
2019-04-27  9:36   ` Brendan Tildesley [this message]
2019-04-27  9:36   ` [bug#35446] [PATCH 14/26] gnu: Add python-html2text, python2-html2text Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 15/26] gnu: calibre: Add python2-html2text as an input Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 16/26] gnu: python-regex, python2-regex: Update to 2019.04.14 Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 17/26] gnu: calibre: Disable tests that require networking Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 18/26] gnu: Add python-soupsieve, python2-soupsieve Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 19/26] gnu: calibre: Use linux.py to install desktop files Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 20/26] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 21/26] gnu: calibre: Disable Qt test Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 22/26] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 23/26] gnu: Calibre: Remove some comments Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 24/26] gnu: calibre: Unbundle python2-odfpy Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 25/26] gnu: calibre: Remove libxrender as an input Brendan Tildesley
2019-04-27  9:36   ` [bug#35446] [PATCH 26/26] gnu: calibre: Delete various junk from source Brendan Tildesley
2019-04-27 10:14 ` [bug#35446] [PATCH 25/26]: gnu: calibre: Delete various junk from source. (fix typos) Brendan Tildesley
2019-05-03 11:22 ` [bug#35446] [PATCH 0/26] Calibre: Update to 3.41.3 Andreas Enge
2019-05-03 16:42 ` [bug#35446] [PATCH v2 01/24] gnu: calibre: " Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 02/24] gnu: calibre: Use system mathjax Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 03/24] gnu: calibre: Build rapydscript Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 04/24] gnu: calibre: Add missing dependencies as indicated by tests Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 05/24] gnu: calibre: Patch out unrar test Brendan Tildesley
2019-05-05 11:19     ` Danny Milosavljevic
2019-05-05 11:32       ` Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 06/24] gnu: calibre: Move font unbundling to after check phase Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 07/24] gnu: Add python-html2text, python2-html2text Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 08/24] gnu: calibre: Add python2-html2text as an input Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 09/24] gnu: python-regex, python2-regex: Update to 2019.04.14 Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 10/24] gnu: calibre: Disable tests that require networking Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 11/24] gnu: Add python-soupsieve, python2-soupsieve Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 12/24] gnu: calibre: Use linux.py to install desktop files Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 13/24] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 14/24] gnu: calibre: Disable Qt test Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 15/24] gnu: calibre: Disable sqlite test Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 16/24] gnu: calibre: Enable tests Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 17/24] gnu: calibre: Remove some comments Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 18/24] gnu: calibre: Unbundle python2-odfpy Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 19/24] gnu: calibre: Remove libxrender as an input Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 20/24] gnu: calibre: Delete various junk from source Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 21/24] gnu: calibre: Install man pages Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 22/24] gnu: calibre: Shorten long line Brendan Tildesley
2019-05-03 16:42   ` [bug#35446] [PATCH v2 23/24] gnu: calibre: Update to 3.42.0 Brendan Tildesley
2019-05-05 15:15     ` bug#35446: " Danny Milosavljevic
2019-05-03 16:42   ` [bug#35446] [PATCH v2 24/24] Correct email and license info for Brendan Tildesley Brendan Tildesley

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190427093659.21851-13-mail@brendan.scot \
    --to=mail@brendan.scot \
    --cc=35446@debbugs.gnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).