[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#42885] [PATCH 24/27] gnu: calibre: Patch some paths.
From: |
Brendan Tildesley |
Subject: |
[bug#42885] [PATCH 24/27] gnu: calibre: Patch some paths. |
Date: |
Wed, 10 Mar 2021 20:00:50 +1100 |
* gnu/packages/ebook.scm (calibre):
[inputs]: Add libjpeg and libjxz.
[arguments]: substitute Calibre's weird get_exe_path procedure that looks
in poppler's output directory for binaries with direct paths to
jpegtran, cjpeg, optipng, and JxrDecApp.
---
gnu/packages/ebook.scm | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 124fcda4df..be367a5245 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -161,6 +161,8 @@
("icu4c" ,icu4c)
("libmtp" ,libmtp)
("libpng" ,libpng)
+ ("libjpeg" ,libjpeg-turbo)
+ ("libjxr" ,libjxr)
("libusb" ,libusb)
("openssl" ,openssl)
("optipng" ,optipng)
@@ -246,7 +248,12 @@ sip-include-dirs = [\"" pyqt "/share/sip" "\"]")))
(("PDFTOHTML = 'pdftohtml'")
(string-append "PDFTOHTML = \"" (assoc-ref inputs "poppler")
"/bin/pdftohtml\"")))
-
+ ;; get_exe_path looks in poppler's output for these binaries.
+ (substitute* "src/calibre/utils/img.py"
+ (("get_exe_path..jpegtran..") (string-append "'" (which
"jpegtran") "'"))
+ (("get_exe_path..cjpeg..") (string-append "'" (which "cjpeg")
"'"))
+ (("get_exe_path..optipng..") (string-append "'" (which
"optipng") "'"))
+ (("get_exe_path..JxrDecApp..") (string-append "'" (which
"JxrDecApp") "'")))
;; Calibre thinks we are installing desktop files into a home
;; directory, but here we butcher the script in to installing
;; to calibres /share directory.
--
2.30.1
- [bug#42885] [PATCH 06/27] gnu: python-pyqt: Fix build for new python-sip., (continued)
- [bug#42885] [PATCH 06/27] gnu: python-pyqt: Fix build for new python-sip., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 08/27] gnu: Add python-zeroconf., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 07/27] gnu: Add python-ifaddr., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 12/27] gnu: python-zstandard: Update to 0.15.2., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 11/27] gnu: Add python-ppmd-cffi., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 17/27] gnu: python-feedparser: Update to 6.0.2., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 04/27] gnu: Add python-pyqt-builder., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 09/27] gnu: Add python-pyannotate., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 14/27] gnu: Add python-bcj-cffi., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 21/27] gnu: Add python-cchardet., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 24/27] gnu: calibre: Patch some paths.,
Brendan Tildesley <=
- [bug#42885] [PATCH 10/27] gnu: Add python-multivolumefile., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 15/27] gnu: Add python-py7zr., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 18/27] gnu: python-poppler-qt5: Fix build., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 20/27] gnu: Add python-pychm., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 13/27] gnu: Add python-pyzstd, Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 16/27] gnu: python-markdown: Update to 3.3.4., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 19/27] gnu: python-poppler-qt5: Update to 21.1.0., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 22/27] gnu: python-html5lib: Add python-chardet input., Brendan Tildesley, 2021/03/10
- [bug#42885] [PATCH 23/27] gnu: calibre: Update to 5.13.0., Brendan Tildesley, 2021/03/10