diff options
| author | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2017-06-26 00:00:58 -0400 |
| commit | ed068b960eeedb92823238783779730319b8ba0e (patch) | |
| tree | 36a4de280458d52520b911b2716eb5cea309fd78 /gnu/packages/ebook.scm | |
| parent | a9308efec642bfbce480545a22fce848e6212456 (diff) | |
| parent | ffc015bea26f24d862e7e877d907fbe1ab9a9967 (diff) | |
| download | guix-ed068b960eeedb92823238783779730319b8ba0e.tar guix-ed068b960eeedb92823238783779730319b8ba0e.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'gnu/packages/ebook.scm')
| -rw-r--r-- | gnu/packages/ebook.scm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 1d64e9b69f..bbb127a7d9 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org> +;;; Copyright © 2017 Roel Janssen <roel@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,7 +66,7 @@ (define-public calibre (package (name "calibre") - (version "2.85.1") + (version "3.0.0") (source (origin (method url-fetch) @@ -74,7 +75,7 @@ version ".tar.xz")) (sha256 (base32 - "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc")) + "1zhk7bvgr973dd18x4wp48kzai29qqqi5qcy72sxc4wcbk2sbnkw")) ;; Remove non-free or doubtful code, see ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) @@ -84,13 +85,11 @@ (delete-file-recursively "src/unrar") (delete-file "src/odf/thumbnail.py") (delete-file-recursively "resources/fonts/liberation") - (delete-file-recursively "src/chardet") (substitute* (find-files "." "\\.py") (("calibre\\.ebooks\\.markdown") "markdown")) #t)) (patches (search-patches "calibre-drop-unrar.patch" "calibre-use-packaged-feedparser.patch" - "calibre-dont-load-remote-icons.patch" "calibre-no-updates-dialog.patch")))) (build-system python-build-system) (native-inputs @@ -132,6 +131,7 @@ ("python2-pygments" ,python2-pygments) ("python2-pyqt" ,python2-pyqt) ("python2-sip" ,python2-sip) + ("python2-regex" ,python2-regex) ("sqlite" ,sqlite))) (arguments `(#:python ,python-2 @@ -148,6 +148,12 @@ ;; We can't use the uninstaller in Guix. Don't build it. (("self\\.create_uninstaller()") "")) #t)) + (add-after 'unpack 'dont-load-remote-icons + (lambda _ + (substitute* "setup/plugins_mirror.py" + (("href=\"//calibre-ebook.com/favicon.ico\"") + "href=\"favicon.ico\"")) + #t)) (add-before 'build 'configure (lambda* (#:key inputs #:allow-other-keys) (let ((podofo (assoc-ref inputs "podofo")) |