From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
To: 26924@debbugs.gnu.org
Subject: bug#26924: [PATCH 06/10] gnu: calibre: Unbundle liberation fonts.
Date: Tue, 16 May 2017 14:54:33 +1000 [thread overview]
Message-ID: <ee68636b-dd06-8ea8-3162-4f770aeb7f9e@openmailbox.org> (raw)
In-Reply-To: <a474bf3a-2be1-5d4a-28d8-0ef3267e29ce@openmailbox.org>
[-- Attachment #1: Type: text/plain, Size: 1 bytes --]
[-- Attachment #2: 0006-gnu-calibre-Unbundle-liberation-fonts.patch --]
[-- Type: text/x-patch, Size: 2836 bytes --]
From cbefb7812c9309bd860f56ec79aa5755291c5261 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Date: Sun, 14 May 2017 16:36:13 +1000
Subject: [PATCH 06/10] gnu: calibre: Unbundle liberation fonts.
*gnu/packages/ebook.scm (calibre): Delete liberation .ttf files.
[native-inputs]: Add font-liberation.
[arguments]: Calibre still references the bundled fonts, so we install the
packaged fonts to the directory the bundled fonts would have been.
---
gnu/packages/ebook.scm | 15 ++++++++++++++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 5af0d0480..3b241c670 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -28,6 +28,7 @@
#:use-module (guix build-system python)
#:use-module (gnu packages)
#:use-module (gnu packages databases)
+ #:use-module (gnu packages fonts)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages freedesktop)
#:use-module (gnu packages glib)
@@ -79,6 +80,7 @@
'(begin
(delete-file-recursively "src/calibre/ebooks/markdown")
(delete-file-recursively "src/unrar")
+ (delete-file-recursively "resources/fonts/liberation")
(substitute* (find-files "." "\\.py")
(("calibre\\.ebooks\\.markdown") "markdown"))
#t))
@@ -89,6 +91,7 @@
(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
@@ -145,7 +148,17 @@
(substitute* "setup/build_environment.py"
(("sys.prefix") (string-append "'" pyqt "'")))
(setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo"))
- (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib"))))))))
+ (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")))))
+ (add-after 'install 'install-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")))
+ #t)))))
(home-page "http://calibre-ebook.com/")
(synopsis "E-book library management software")
(description "Calibre is an ebook library manager. It can view, convert
--
2.13.0
next prev parent reply other threads:[~2017-05-16 4:55 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-14 15:00 bug#26924: [PATCH 0/12] Update Calibre to 2.85.1 Brendan Tildesley
2017-05-14 15:02 ` bug#26924: [PATCH 01/12] " Brendan Tildesley
2017-05-15 16:34 ` Marius Bakke
2017-05-14 15:03 ` bug#26924: [PATCH 02/12] " Brendan Tildesley
2017-05-14 15:16 ` Brendan Tildesley
2017-05-15 16:36 ` Marius Bakke
2017-05-14 15:05 ` bug#26924: [PATCH 03/12] gnu: calibre: Import dont-load-icons patch from debian Brendan Tildesley
2017-05-15 16:38 ` Marius Bakke
2017-05-14 15:05 ` bug#26924: [PATCH 04/12] gnu: calibre: Import unbundle feedparser patch from Brendan Tildesley
2017-05-15 16:51 ` Marius Bakke
2017-05-14 15:06 ` bug#26924: [PATCH 05/12] gnu: calibre: Unbundle python2-markdown Brendan Tildesley
2017-05-15 16:56 ` Marius Bakke
2017-05-14 15:07 ` bug#26924: [PATCH 06/12] gnu: calibre: Undelete GPLv2 icon file Brendan Tildesley
2017-05-15 17:00 ` Marius Bakke
2017-05-16 1:02 ` Brendan Tildesley
2017-05-19 21:07 ` Marius Bakke
2017-05-14 15:08 ` bug#26924: [PATCH 07/12] gnu: calibre: Unbundle liberation fonts Brendan Tildesley
2017-05-15 17:05 ` Marius Bakke
2017-05-14 15:09 ` bug#26924: [PATCH 08/12] gnu: calibre: Unbundle chardet Brendan Tildesley
2017-05-15 17:06 ` Marius Bakke
2017-05-14 15:09 ` bug#26924: [PATCH 09/12] gnu: calibre: Add missing dependencies Brendan Tildesley
2017-05-15 17:09 ` Marius Bakke
2017-05-14 15:10 ` bug#26924: [PATCH 10/12] gnu: chmlib: Use #:prefix license: Brendan Tildesley
2017-05-15 17:27 ` Marius Bakke
2017-05-14 15:11 ` bug#26924: [PATCH 11/12] gnu: calibre: Add exhaustive license list Brendan Tildesley
2017-05-15 17:23 ` Marius Bakke
2017-05-14 15:14 ` bug#26924: [PATCH 12/12] gnu: calibre: Don't create uninstaller Brendan Tildesley
2017-05-15 17:24 ` Marius Bakke
2017-05-15 16:32 ` bug#26924: [PATCH 0/12] Update Calibre to 2.85.1 Marius Bakke
2017-05-16 4:48 ` bug#26924: [PATCH 1/12] Update Calibre to 2.85.1 [REVISED] Brendan Tildesley
2017-05-16 4:50 ` bug#26924: [PATCH 02/10] gnu: calibre: Import dont-load-icons patch from debian Brendan Tildesley
2017-05-16 4:51 ` bug#26924: [PATCH 03/10] gnu: calibre: Import unbundle feedparser patch from Brendan Tildesley
2017-05-16 4:52 ` bug#26924: [PATCH 04/10] gnu: calibre: Unbundle python2-markdown Brendan Tildesley
2017-05-16 4:53 ` bug#26924: [PATCH 05/10] gnu: calibre: Undelete GPLv2 icon file Brendan Tildesley
2017-05-16 4:54 ` Brendan Tildesley [this message]
2017-05-16 4:55 ` bug#26924: [PATCH 07/10] gnu: calibre: Unbundle chardet Brendan Tildesley
2017-05-16 4:56 ` bug#26924: [PATCH 08/10] gnu: calibre: Add missing dependencies Brendan Tildesley
2017-05-16 4:58 ` bug#26924: [PATCH 09/10] gnu: calibre: Add exhaustive license list Brendan Tildesley
2017-05-19 21:58 ` Marius Bakke
2017-05-16 4:59 ` bug#26924: [PATCH 10/10] gnu: calibre: Don't create uninstaller Brendan Tildesley
2017-05-19 21:21 ` Marius Bakke
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=ee68636b-dd06-8ea8-3162-4f770aeb7f9e@openmailbox.org \
--to=brendan.tildesley@openmailbox.org \
--cc=26924@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).