From 4e6f8a1442d04a4dd9066c4bda0a3c06cb4af5d3 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:09 +1000 Subject: gnu: calibre: Update to 3.41.3. * gnu/packages/ebook.scm (calibre): Update to 3.41.3. [inputs]: Replace python2-cssutils by python2-css-parser. [snippet]: Modify. * gnu/packages/patches/calibre-use-packaged-feedparser.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Remove patch. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 99e49bc172..a603519590 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -78,7 +78,7 @@ (define-public calibre (package (name "calibre") - (version "3.35.0") + (version "3.41.3") (source (origin (method url-fetch) @@ -87,20 +87,16 @@ version ".tar.xz")) (sha256 (base32 - "1gd15wjz4fhcra6d44xiy3hwbyk0miwb66a1pq5yldyy0hlb271z")) + "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) ;; Remove non-free or doubtful code, see ;; 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")))) + (patches (search-patches "calibre-no-updates-dialog.patch")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) @@ -129,7 +125,7 @@ ("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) -- cgit v1.2.3 From d243b41dd06144c739c7391f3fcdf1ad889bc722 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:10 +1000 Subject: gnu: calibre: Use system mathjax. * gnu/packages/ebook.scm (calibre)[arguments]<#:phases>[build-extra]: New phase. [inputs]: Add js-mathjax. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index a603519590..1d815489a6 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -42,6 +42,7 @@ #: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) @@ -113,6 +114,7 @@ ("fontconfig" ,fontconfig) ("glib" ,glib) ("icu4c" ,icu4c) + ("js-mathjax" ,js-mathjax) ("libmtp" ,libmtp) ("libpng" ,libpng) ("libusb" ,libusb) @@ -181,6 +183,10 @@ (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (setenv "PODOFO_LIB_DIR" (string-append podofo "/lib")) #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")))) (add-after 'install 'install-font-liberation (lambda* (#:key inputs outputs #:allow-other-keys) (for-each (lambda (file) -- cgit v1.2.3 From b0038957f5d748dda9b7bda9873f11c029e3bb70 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:11 +1000 Subject: gnu: calibre: Build rapydscript. * gnu/packages/ebook.scm (calibre)[arguments]<#:phases>[build-extra]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 1d815489a6..62d1c3a72e 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -186,7 +186,8 @@ (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")))) + (string-append (assoc-ref inputs "js-mathjax") "/share/javascript/mathjax")) + (invoke "python2" "setup.py" "rapydscript"))) (add-after 'install 'install-font-liberation (lambda* (#:key inputs outputs #:allow-other-keys) (for-each (lambda (file) -- cgit v1.2.3 From 4f299020801f1f41ff66d93b7a7a8c51285c3675 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:12 +1000 Subject: gnu: calibre: Add missing dependencies as indicated by tests. * gnu/packages/ebook.scm (calibre)[inputs]: Add python2-html5lib, python2-psutil. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 2 ++ 1 file changed, 2 insertions(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 62d1c3a72e..6bc3813725 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -134,6 +134,7 @@ ("python2-dukpy" ,python2-dukpy) ("python2-feedparser" ,python2-feedparser) ("python2-html5-parser" ,python2-html5-parser) + ("python2-html5lib" ,python2-html5lib) ("python2-lxml" ,python2-lxml) ("python2-markdown" ,python2-markdown) ("python2-mechanize" ,python2-mechanize) @@ -141,6 +142,7 @@ ("python2-msgpack" ,python2-msgpack) ("python2-netifaces" ,python2-netifaces) ("python2-pillow" ,python2-pillow) + ("python2-psutil" ,python2-psutil) ("python2-pygments" ,python2-pygments) ("python2-pyqt" ,python2-pyqt) ("python2-sip" ,python2-sip) -- cgit v1.2.3 From 13068a8ccf68653f082728b8809c46970cb97f60 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 5 May 2019 13:35:14 +0200 Subject: gnu: calibre: Move font unbundling to after check phase. * gnu/packages/ebook.scm (calibre)[snippet]: Modify. [native-inputs]: Remove font-liberation. [inputs]: Add font-liberation. [arguments]<#:phases>[install-font-liberation]: Delete phase. [unbundle-font-liberation]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 6bc3813725..799eed6095 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -95,13 +95,11 @@ (snippet '(begin (delete-file "src/odf/thumbnail.py") - (delete-file-recursively "resources/fonts/liberation") #t)) (patches (search-patches "calibre-no-updates-dialog.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 @@ -112,6 +110,7 @@ (inputs `(("chmlib" ,chmlib) ("fontconfig" ,fontconfig) + ("font-liberation" ,font-liberation) ("glib" ,glib) ("icu4c" ,icu4c) ("js-mathjax" ,js-mathjax) @@ -190,17 +189,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") -- cgit v1.2.3 From adc25b68b16643e95cd8248331ad75afecf86c63 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:16 +1000 Subject: gnu: calibre: Add python2-html2text as an input. * gnu/packages/ebook.scm (calibre)[inputs]: Add python2-html2text. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 799eed6095..b26eacac52 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -132,6 +132,7 @@ ("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) -- cgit v1.2.3 From 15871b40872b9534a9dc3af9fda163601a360a51 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 5 May 2019 14:04:02 +0200 Subject: gnu: calibre: Remove unrar test. * gnu/packages/patches/calibre-remove-test-unrar.patch: New file. * gnu/packages/ebook.scm (calibre)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index b26eacac52..79fa99cf4a 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -96,7 +96,8 @@ '(begin (delete-file "src/odf/thumbnail.py") #t)) - (patches (search-patches "calibre-no-updates-dialog.patch")))) + (patches (search-patches "calibre-no-updates-dialog.patch" + "calibre-remove-test-unrar.patch")))) (build-system python-build-system) (native-inputs `(("pkg-config" ,pkg-config) -- cgit v1.2.3 From b01cde1ac98395d9a3007bf5329ebb7f860c13d0 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:18 +1000 Subject: gnu: calibre: Disable tests that require networking. * gnu/packages/ebook.scm (calibre)[arguments]<#:phases>[configure]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 79fa99cf4a..2b557ab08d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -185,6 +185,9 @@ "/bin/pdftohtml\""))) (setenv "PODOFO_INC_DIR" (string-append podofo "/include/podofo")) (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") #t))) (add-after 'build 'build-extra (lambda* (#:key inputs #:allow-other-keys) -- cgit v1.2.3 From 6e1ab5fadbc8fbe5d8d71864c68dd52ddbc732c9 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:20 +1000 Subject: gnu: calibre: Use "linux.py" to install desktop files. * gnu/packages/ebook.scm (calibre)[arguments]<#:phases>[configure]: Modify. [install-mimetypes]: Remove. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 2b557ab08d..964fdd7b75 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -102,9 +102,6 @@ (native-inputs `(("pkg-config" ,pkg-config) ("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. @@ -174,15 +171,24 @@ "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\""))) + "/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")) ;; This informs the tests we are a continuous integration @@ -204,12 +210,6 @@ "/share/fonts/truetype"))) (delete-file-recursively font-dest) (symlink font-src font-dest)) - #t)) - (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") - "/share/mime/packages")) #t))))) (home-page "http://calibre-ebook.com/") (synopsis "E-book library management software") -- cgit v1.2.3 From f89f5abada5dce72a6b40b2310bc9b5b97a6f1a9 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:21 +1000 Subject: gnu: calibre: Disable bs4 test. * gnu/packages/patches/calibre-remove-test-bs4.patch: New file. * gnu/packages/ebook.scm (calibre)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 964fdd7b75..b5f8283996 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -97,6 +97,7 @@ (delete-file "src/odf/thumbnail.py") #t)) (patches (search-patches "calibre-no-updates-dialog.patch" + "calibre-remove-test-bs4.patch" ; TODO: fix test. "calibre-remove-test-unrar.patch")))) (build-system python-build-system) (native-inputs -- cgit v1.2.3 From 4bcd0647b7fa6daf3bab604ef71d2420c5b8811c Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:22 +1000 Subject: gnu: calibre: Disable Qt test. * gnu/packages/ebook.scm (calibre)[arguments]<#:phases>[configure]: Disable Qt test. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index b5f8283996..cf5a351314 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -195,6 +195,10 @@ ;; 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) -- cgit v1.2.3 From cbe399e7367eb2957026618689708b7d25500920 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:23 +1000 Subject: gnu: calibre: Disable sqlite test. * gnu/packages/patches/calibre-remove-test-sqlite.patch: New file. * gnu/packages/ebook.scm (calibre)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index cf5a351314..242a2a2f46 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -98,6 +98,7 @@ #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 -- cgit v1.2.3 From eb5f620134ea96b990cb0da667cab81c281d3208 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:24 +1000 Subject: gnu: calibre: Enable tests. * gnu/packages/ebook.scm (calibre): Enable tests. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 2 -- 1 file changed, 2 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 242a2a2f46..efc504337f 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -153,8 +153,6 @@ ("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 -- cgit v1.2.3 From 7312a7d073fba1b1d0e1951fa93f5b3a66a4354e Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:25 +1000 Subject: gnu: calibre: Remove some comments. * gnu/packages/ebook.scm (calibre): There is no unrar in Guix currently, and pdftohtml is in poppler, so we can remove this comment. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 3 --- 1 file changed, 3 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index efc504337f..ba99ce9316 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -147,9 +147,6 @@ ("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 -- cgit v1.2.3 From 68435a7f553c1efeab15965129cb249be4595233 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 5 May 2019 14:33:35 +0200 Subject: gnu: calibre: Unbundle python2-odfpy. * gnu/packages/ebook.scm (calibre)[snippet]: Remove all of src/odf. [inputs]: Add python2-odfpy. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index ba99ce9316..d281e2fb5d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -89,13 +89,13 @@ (sha256 (base32 "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) - ;; Remove non-free or doubtful code, see + ;; Unbundle python2-odfpy. ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) (snippet '(begin - (delete-file "src/odf/thumbnail.py") - #t)) + (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. @@ -141,6 +141,7 @@ ;; 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) -- cgit v1.2.3 From 62a97dc0fb144b92a53ee4481a99ebeb20b2fcbe Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:27 +1000 Subject: gnu: calibre: Remove libxrender as an input. * gnu/packages/ebook.scm (calibre)[inputs]: Remove libxrender. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index d281e2fb5d..00e8f40be5 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -117,7 +117,6 @@ ("libmtp" ,libmtp) ("libpng" ,libpng) ("libusb" ,libusb) - ("libxrender" ,libxrender) ("openssl" ,openssl) ("optipng" ,optipng) ("podofo" ,podofo) -- cgit v1.2.3 From f3f017dbf0b52bba09ab8390c06cca5ff6030b8f Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sun, 5 May 2019 14:35:44 +0200 Subject: gnu: calibre: Delete various junk from source. * gnu/packages/ebook.scm (calibre)[source](snippet): Delete various junk from source. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 00e8f40be5..9408d5501d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -95,6 +95,11 @@ (snippet '(begin (delete-file-recursively "src/odf") + (delete-file "resources/viewer.js") + (delete-file "resources/viewer.html") + (delete-file "resources/mozilla-ca-certs.pem") + (delete-file "resources/calibre-portable.bat") + (delete-file "resources/calibre-portable.sh") #t)) (patches (search-patches "calibre-no-updates-dialog.patch" "calibre-remove-test-bs4.patch" ; TODO: fix test. -- cgit v1.2.3 From d6dfe8b6341be432d3a45e6ff86e78edb247f266 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:29 +1000 Subject: gnu: calibre: Install man pages. * gnu/packages/ebook.scm (calibre)[arguments]<#:phases>[install-man-pages]: New phase. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 9408d5501d..257fbd2478 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -206,6 +206,12 @@ (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-man-pages + (lambda* (#:key outputs #:allow-other-keys) + (copy-recursively + "man-pages" + (string-append (assoc-ref outputs "out") "/share/man")) + #t)) ;; 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 -- cgit v1.2.3 From 421c5e92f96e89000277e83c64ade65e92880d7a Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:30 +1000 Subject: gnu: calibre: Shorten long line. * gnu/packages/ebook.scm (calibre)[arguments]<#:phases>[build-extra]: Shorten long line. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 257fbd2478..068ac5b0a8 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -203,8 +203,10 @@ #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" "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-man-pages (lambda* (#:key outputs #:allow-other-keys) -- cgit v1.2.3 From ee3ce0d71d51d0b93d91a8ef1c82e8d233a74b33 Mon Sep 17 00:00:00 2001 From: Danny Milosavljevic Date: Sun, 5 May 2019 14:39:05 +0200 Subject: gnu: calibre: Update to 3.42.0. * gnu/packages/ebook.scm (calibre): Update to 3.42.0. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 068ac5b0a8..454e65a4aa 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -79,7 +79,7 @@ (define-public calibre (package (name "calibre") - (version "3.41.3") + (version "3.42.0") (source (origin (method url-fetch) @@ -88,7 +88,7 @@ version ".tar.xz")) (sha256 (base32 - "167hhv4wimkjnyfgqkyqmaiixhicbxacy6190gps98jyj4csi8ra")) + "0ymdhws3cb44p3fb24vln1wx6s7qnb8rr241jvm6qbj5rnp984dm")) ;; Unbundle python2-odfpy. ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html (modules '((guix build utils))) -- cgit v1.2.3 From dcfa0acd7be3d6beaa87aae0ebe92104d7626a57 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 4 May 2019 02:42:32 +1000 Subject: Correct email and license info for Brendan Tildesley. * gnu/packages/audio.scm: Correct email and license info. * gnu/packages/ebook.scm: Correct email and license info. * gnu/packages/fonts.scm: Correct email and license info. * gnu/packages/freedesktop.scm: Correct email and license info. * gnu/packages/gnome.scm: Correct email and license info. * gnu/packages/linux.scm: Correct email and license info. * gnu/packages/lxde.scm: Correct email and license info. * gnu/packages/python-web.scm: Correct email and license info. * gnu/packages/python-xyz.scm: Correct email and license info. * gnu/packages/python.scm: Correct email and license info. * gnu/packages/video.scm: Correct email and license info. * gnu/packages/web.scm: Correct email and license info. Signed-off-by: Danny Milosavljevic --- gnu/packages/ebook.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/ebook.scm') diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm index 454e65a4aa..cf424f285d 100644 --- a/gnu/packages/ebook.scm +++ b/gnu/packages/ebook.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2015, 2016 Andreas Enge ;;; Copyright © 2016, 2018 Efraim Flashner ;;; Copyright © 2016, 2017 Alex Griffin -;;; Copyright © 2017 Brendan Tildesley +;;; Copyright © 2017, 2019 Brendan Tildesley ;;; Copyright © 2017 Roel Janssen ;;; Copyright © 2018 Tobias Geerinckx-Rice ;;; -- cgit v1.2.3