;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
-;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
+;;; Copyright © 2016, 2018 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>
+;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr>
;;;
;;; This file is part of GNU Guix.
;;;
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
#:use-module (guix download)
+ #:use-module (guix git-download)
#:use-module (guix build-system gnu)
#:use-module (gnu packages)
#:use-module (guix build-system python)
#:use-module (gnu packages glib)
#:use-module (gnu packages icu4c)
#:use-module (gnu packages image)
+ #:use-module (gnu packages javascript)
#:use-module (gnu packages libusb)
#:use-module (gnu packages pdf)
#:use-module (gnu packages pkg-config)
#:use-module (gnu packages python)
+ #:use-module (gnu packages python-web)
+ #:use-module (gnu packages python-xyz)
#:use-module (gnu packages qt)
#:use-module (gnu packages serialization)
+ #:use-module (gnu packages sqlite)
+ #:use-module (gnu packages time)
#:use-module (gnu packages tls)
#:use-module (gnu packages web)
#:use-module (gnu packages xml)
(define-public calibre
(package
(name "calibre")
- (version "3.6.0")
+ (version "3.41.3")
(source
(origin
(method url-fetch)
version ".tar.xz"))
(sha256
(base32
- "0vp2nds4b5xbchsh1rpc1q7093gd26dnw7mgbnax97dcchvlc4sc"))
- ;; Remove non-free or doubtful code, see
+ "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra"))
+ ;; Unbundle python2-odfpy.
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
(modules '((guix build utils)))
(snippet
'(begin
- (delete-file-recursively "src/calibre/ebooks/markdown")
- (delete-file "src/odf/thumbnail.py")
- (delete-file-recursively "resources/fonts/liberation")
- (substitute* (find-files "." "\\.py")
- (("calibre\\.ebooks\\.markdown") "markdown"))
- #t))
- (patches (search-patches "calibre-use-packaged-feedparser.patch"
- "calibre-no-updates-dialog.patch"))))
+ (delete-file-recursively "src/odf")
+ #t))
+ (patches (search-patches "calibre-no-updates-dialog.patch"
+ "calibre-remove-test-bs4.patch" ; TODO: fix test.
+ "calibre-remove-test-sqlite.patch" ; TODO: fix test.
+ "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
- ;; mkdir: cannot create directory '/homeless-shelter': Permission denied
("python2-flake8" ,python2-flake8)
("xdg-utils" ,xdg-utils)))
;; Beautifulsoup3 is bundled but obsolete and not packaged, so just leave it bundled.
(inputs
`(("chmlib" ,chmlib)
("fontconfig" ,fontconfig)
+ ("font-liberation" ,font-liberation)
("glib" ,glib)
("icu4c" ,icu4c)
+ ("js-mathjax" ,js-mathjax)
("libmtp" ,libmtp)
("libpng" ,libpng)
("libusb" ,libusb)
("libxrender" ,libxrender)
("openssl" ,openssl)
+ ("optipng" ,optipng)
("podofo" ,podofo)
("poppler" ,poppler)
("python" ,python-2)
("python2-apsw" ,python2-apsw)
("python2-chardet" ,python2-chardet)
("python2-cssselect" ,python2-cssselect)
- ("python2-cssutils" ,python2-cssutils)
+ ("python2-css-parser" ,python2-css-parser)
("python2-dateutil" ,python2-dateutil)
("python2-dbus" ,python2-dbus)
("python2-dnspython" ,python2-dnspython)
+ ("python2-dukpy" ,python2-dukpy)
("python2-feedparser" ,python2-feedparser)
+ ("python2-html2text" ,python2-html2text)
("python2-html5-parser" ,python2-html5-parser)
+ ("python2-html5lib" ,python2-html5lib)
("python2-lxml" ,python2-lxml)
("python2-markdown" ,python2-markdown)
("python2-mechanize" ,python2-mechanize)
;; python2-msgpack is needed for the network content server to work.
("python2-msgpack" ,python2-msgpack)
("python2-netifaces" ,python2-netifaces)
+ ("python2-odfpy" ,python2-odfpy)
("python2-pillow" ,python2-pillow)
+ ("python2-psutil" ,python2-psutil)
("python2-pygments" ,python2-pygments)
("python2-pyqt" ,python2-pyqt)
("python2-sip" ,python2-sip)
("python2-regex" ,python2-regex)
- ;; python2-unrardll is needed for decompressing RAR files.
- ;; A program called 'pdf2html' is needed for reading PDF books
- ;; in the web interface.
("sqlite" ,sqlite)))
(arguments
`(#:python ,python-2
- #:test-target "check"
- #:tests? #f ; FIXME: enable once flake8 is packaged
;; Calibre is using setuptools by itself, but the setup.py is not
;; compatible with the shim wrapper (taken from pip) we are using.
#:use-setuptools? #f
"href=\"favicon.ico\""))
#t))
(add-before 'build 'configure
- (lambda* (#:key inputs #:allow-other-keys)
+ (lambda* (#:key inputs outputs #:allow-other-keys)
(let ((podofo (assoc-ref inputs "podofo"))
- (pyqt (assoc-ref inputs "python2-pyqt")))
+ (pyqt (assoc-ref inputs "python2-pyqt"))
+ (out (assoc-ref outputs "out")))
(substitute* "setup/build_environment.py"
(("sys.prefix") (string-append "'" pyqt "'")))
+ (substitute* "src/calibre/ebooks/pdf/pdftohtml.py"
+ (("PDFTOHTML = 'pdftohtml'")
+ (string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler")
+ "/bin/pdftohtml\"")))
+
+ ;; Calibre thinks we are installing desktop files into a home
+ ;; directory, but here we butcher the script in to installing
+ ;; to calibres /share directory.
+ (setenv "XDG_DATA_HOME" (string-append out "/share"))
+ (substitute* "src/calibre/linux.py"
+ (("'~/.local/share'") "''"))
+
(setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo"))
- (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")))))
- (add-after 'install 'install-font-liberation
+ (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib"))
+ ;; This informs the tests we are a continuous integration
+ ;; environment and thus have no networking.
+ (setenv "CI" "true")
+ ;; The Qt test complains about being unable to load all image plugins, and I
+ ;; notice the available plugins list it shows lacks 'svg'. Adding qtsvg doesn't
+ ;; fix it, so I'm not sure how to fix it. TODO: Fix test and remove this.
+ (setenv "SKIP_QT_BUILD_TEST" "true")
+ #t)))
+ (add-after 'build 'build-extra
+ (lambda* (#:key inputs #:allow-other-keys)
+ (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")))
+ ;; 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)))))
(home-page "http://calibre-ebook.com/")
(synopsis "E-book library management software")
- (description "Calibre is an ebook library manager. It can view, convert
-and catalog ebooks in most of the major ebook formats. It can also talk
-to many ebook reader devices. It can go out to the Internet and fetch
+ (description "Calibre is an e-book library manager. It can view, convert
+and catalog e-books in most of the major e-book formats. It can also talk
+to many e-book reader devices. It can go out to the Internet and fetch
metadata for books. It can download newspapers and convert them into
-ebooks for convenient reading.")
+e-books for convenient reading.")
;; Calibre is largely GPL3+, but includes a number of components covered
;; by other licenses. See COPYRIGHT for more details.
(license (list license:gpl3+
(name "fbreader")
(version "0.99.6")
(source (origin
- (method url-fetch)
- (uri (string-append "https://github.com/geometer/FBReader/"
- "archive/" version "-freebsdport.tar.gz"))
- (file-name (string-append name "-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/geometer/FBReader")
+ (commit (string-append version "-freebsdport"))))
+ (file-name (git-file-name name version))
(sha256
(base32
- "0gf1nl562fqkwlzcn6rgkp1j8jcixzmfsnwxbc0sm49zh8n3zqib"))))
+ "0c0s4silpax74kwfz3dfmzn4lkv6jsyb800vfak166vii0hvbv3d"))
+ (patches (search-patches "fbreader-curl-7.62.patch"))))
(build-system gnu-build-system)
(inputs
`(("curl" ,curl)
(assoc-ref %outputs "out") "/lib"))
#:phases
(modify-phases %standard-phases
- (delete 'configure))))
+ (delete 'configure)
+ (add-after 'unpack 'fix-install-locations
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (substitute* "fbreader/desktop/Makefile"
+ (("/usr") out))
+ #t))))))
(home-page "https://fbreader.org/")
(synopsis "E-Book reader")
(description "@code{fbreader} is an E-Book reader. It supports the
HCoop / jackhill / guix / guix.git / blobdiff