From: Brendan Tildesley <mail@brendan.scot>
To: 35446@debbugs.gnu.org
Subject: [bug#35446] [PATCH v2 12/24] gnu: calibre: Use linux.py to install desktop files.
Date: Sat, 4 May 2019 02:42:20 +1000 [thread overview]
Message-ID: <20190503164232.1799-12-mail@brendan.scot> (raw)
In-Reply-To: <20190503164232.1799-1-mail@brendan.scot>
* gnu/packages/ebook.scm (calibre):[arguments]: linux.py is for installing
various freedestkop files in one's home directory. Here we hack it to
install into the /share folder in the output.
This also installs the mimetypes.xml, so we no longer require that
explicit phase.
Note that the patch looks a little confusing as the diff thinks I've
remove a #t)) line and left the other #t)))) line below it, but it all adds
up.
---
gnu/packages/ebook.scm | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
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")
--
2.21.0
next prev parent reply other threads:[~2019-05-03 16:45 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-27 6:36 [bug#35446] [PATCH 0/26] Calibre: Update to 3.41.3 Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 01/26] gnu: Use 'license:' prefix in (gnu packages web) Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 02/26] gnu: Add python-css-parser, python2-css-parser Brendan Tildesley
2019-05-03 11:48 ` Andreas Enge
2019-04-27 9:36 ` [bug#35446] [PATCH 03/26] gnu: calibre: Update to 3.41.3 Brendan Tildesley
2019-05-03 11:57 ` Andreas Enge
2019-05-03 16:49 ` Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 04/26] gnu: calibre: Remove feedparser patch Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 05/26] Update email address for Brendan Tildesley Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 06/26] gnu: calibre: [inputs]: Replace cssutils with the css-parser fork Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 07/26] gnu: calibre: Remove markdown unbundling code Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 08/26] gnu: calibre: Use system mathjax Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 09/26] gnu: calibre: Build rapydscript Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 10/26] gnu: calibre: Enable tests Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 11/26] gnu: calibre: Add missing dependencies as indicated by tests Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 12/26] gnu: calibre: Patch out unrar test Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 13/26] gnu: calibre: Move font unbundling to after check phase Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 14/26] gnu: Add python-html2text, python2-html2text Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 15/26] gnu: calibre: Add python2-html2text as an input Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 16/26] gnu: python-regex, python2-regex: Update to 2019.04.14 Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 17/26] gnu: calibre: Disable tests that require networking Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 18/26] gnu: Add python-soupsieve, python2-soupsieve Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 19/26] gnu: calibre: Use linux.py to install desktop files Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 20/26] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 21/26] gnu: calibre: Disable Qt test Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 22/26] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 23/26] gnu: Calibre: Remove some comments Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 24/26] gnu: calibre: Unbundle python2-odfpy Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 25/26] gnu: calibre: Remove libxrender as an input Brendan Tildesley
2019-04-27 9:36 ` [bug#35446] [PATCH 26/26] gnu: calibre: Delete various junk from source Brendan Tildesley
2019-04-27 10:14 ` [bug#35446] [PATCH 25/26]: gnu: calibre: Delete various junk from source. (fix typos) Brendan Tildesley
2019-05-03 11:22 ` [bug#35446] [PATCH 0/26] Calibre: Update to 3.41.3 Andreas Enge
2019-05-03 16:42 ` [bug#35446] [PATCH v2 01/24] gnu: calibre: " Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 02/24] gnu: calibre: Use system mathjax Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 03/24] gnu: calibre: Build rapydscript Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 04/24] gnu: calibre: Add missing dependencies as indicated by tests Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 05/24] gnu: calibre: Patch out unrar test Brendan Tildesley
2019-05-05 11:19 ` Danny Milosavljevic
2019-05-05 11:32 ` Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 06/24] gnu: calibre: Move font unbundling to after check phase Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 07/24] gnu: Add python-html2text, python2-html2text Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 08/24] gnu: calibre: Add python2-html2text as an input Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 09/24] gnu: python-regex, python2-regex: Update to 2019.04.14 Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 10/24] gnu: calibre: Disable tests that require networking Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 11/24] gnu: Add python-soupsieve, python2-soupsieve Brendan Tildesley
2019-05-03 16:42 ` Brendan Tildesley [this message]
2019-05-03 16:42 ` [bug#35446] [PATCH v2 13/24] gnu: calibre: Disable bs4 test Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 14/24] gnu: calibre: Disable Qt test Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 15/24] gnu: calibre: Disable sqlite test Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 16/24] gnu: calibre: Enable tests Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 17/24] gnu: calibre: Remove some comments Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 18/24] gnu: calibre: Unbundle python2-odfpy Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 19/24] gnu: calibre: Remove libxrender as an input Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 20/24] gnu: calibre: Delete various junk from source Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 21/24] gnu: calibre: Install man pages Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 22/24] gnu: calibre: Shorten long line Brendan Tildesley
2019-05-03 16:42 ` [bug#35446] [PATCH v2 23/24] gnu: calibre: Update to 3.42.0 Brendan Tildesley
2019-05-05 15:15 ` bug#35446: " Danny Milosavljevic
2019-05-03 16:42 ` [bug#35446] [PATCH v2 24/24] Correct email and license info for Brendan Tildesley Brendan Tildesley
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190503164232.1799-12-mail@brendan.scot \
--to=mail@brendan.scot \
--cc=35446@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 external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.