From: Brendan Tildesley via Guix-patches via <guix-patches@gnu.org>
To: "42885@debbugs.gnu.org" <42885@debbugs.gnu.org>
Subject: [bug#42885] [PATCHES] 2 more fixes.
Date: Sun, 21 Mar 2021 08:00:15 +0100 (CET) [thread overview]
Message-ID: <2053979569.43243.1616310015760@office.mailbox.org> (raw)
In-Reply-To: <8b1e2bed-e543-44a2-574b-f3c2c5a14d3f@brendan.scot>
[-- Attachment #1.1: Type: text/plain, Size: 88 bytes --]
These two patches go after the last 27 patches, fixing up some mistakes I made earlier.
[-- Attachment #1.2: Type: text/html, Size: 238 bytes --]
[-- Attachment #2: 0001-gnu-calibre-Don-t-install-junk-temporary-files.patch --]
[-- Type: text/x-patch, Size: 1348 bytes --]
From a222592c08909b67ff2334f617a7b273cc5ab082 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sat, 20 Mar 2021 21:28:22 +1100
Subject: [PATCH 1/2] gnu: calibre: Don't install junk temporary files.
* gnu/packages/ebook.scm (calibre):
[arguments]: Unset XDG_DATA_HOME just for installing rapydscript so that
Qtwebengine temporary files aren't put in /share/. Moving the phase
until after the install phase prevents breaking .desktop file installation.
---
gnu/packages/ebook.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 25a31c9a65..b55af5c865 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -282,8 +282,10 @@ sip-include-dirs = [\"" pyqt "/share/sip" "\"]")))
;; AssertionError: b'Skia/PDF' not found in b'' : Print to PDF failed
(setenv "SKIP_QT_BUILD_TEST" "true")
#t)))
- (add-after 'build 'build-extra
+ (add-after 'install 'install-rapydscript
(lambda* (#:key inputs #:allow-other-keys)
+ ;; Unset so QtWebengine doesn't dump temporary files here.
+ (unsetenv "XDG_DATA_HOME")
(invoke "python" "setup.py" "rapydscript")
#t))
(add-after 'install 'install-man-pages
--
2.30.2
[-- Attachment #3: 0002-gnu-calibre-Don-t-delete-needed-files.patch --]
[-- Type: text/x-patch, Size: 936 bytes --]
From f8fe46256cbfe211b1bbbb624651cfc5b261ee32 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <mail@brendan.scot>
Date: Sun, 21 Mar 2021 17:18:13 +1100
Subject: [PATCH 2/2] gnu: calibre: Don't delete needed files.
* gnu/packages/ebook.scm (calibre)[snippet]: Don't delete viewer.js
since it's actually used by the html reader.
---
gnu/packages/ebook.scm | 2 --
1 file changed, 2 deletions(-)
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index b55af5c865..6fb525a2c2 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -136,8 +136,6 @@
""))
;; Remove unneeded resources.
- (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")
--
2.30.2
prev parent reply other threads:[~2021-03-21 10:38 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-08-16 6:55 [bug#42885] [PATCH 0/4] gnu: calibre: Update to 4.22.0 Brendan Tildesley
2020-08-21 9:20 ` [bug#42885] [PATCH] gnu: calibre: Update to 4.23.0 Brendan Tildesley
2020-08-22 17:30 ` Leo Famulari
[not found] ` <handler.42885.B.159756092810548.ack@debbugs.gnu.org>
2020-08-16 7:03 ` [bug#42885] [PATCH 1/4] gnu: ebook.scm: remove duplicate module import Brendan Tildesley
2020-08-16 7:03 ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-bin (MathJax 3) Brendan Tildesley
2020-08-24 1:05 ` Leo Famulari
2020-08-24 4:25 ` Arun Isaac
2020-08-24 5:12 ` Brendan Tildesley
2020-08-24 6:44 ` Arun Isaac
2020-08-24 7:27 ` Brendan Tildesley
2020-08-24 7:41 ` Brendan Tildesley
2020-09-04 9:02 ` Ludovic Courtès
2020-09-04 11:59 ` Andreas Enge
2020-09-04 18:13 ` Arun Isaac
2020-09-04 19:43 ` Ricardo Wurmus
2020-09-09 6:36 ` Arun Isaac
2020-09-09 7:19 ` Ricardo Wurmus
2020-09-09 19:48 ` Arun Isaac
2020-09-17 10:14 ` Arun Isaac
2020-09-17 11:24 ` Ricardo Wurmus
2020-09-21 10:36 ` Arun Isaac
2020-09-21 11:08 ` Brendan Tildesley
2020-09-22 5:39 ` Arun Isaac
2020-09-29 23:56 ` [bug#42885] Merge wip-swc Brendan Tildesley
2020-09-30 5:38 ` Arun Isaac
2020-10-12 7:23 ` Arun Isaac
2020-10-12 22:17 ` Brendan Tildesley
2020-10-13 18:44 ` Arun Isaac
2020-10-13 21:22 ` Ricardo Wurmus
2020-10-19 18:45 ` Arun Isaac
2021-01-13 15:00 ` [bug#42885] [PATCH 0/4] gnu: calibre: Update to 4.22.0 Ludovic Courtès
2021-01-14 14:59 ` Arun Isaac
2021-01-14 20:49 ` Ricardo Wurmus
2021-02-17 2:47 ` Brendan Tildesley
2020-09-04 13:10 ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-bin (MathJax 3) Ricardo Wurmus
2020-08-16 7:03 ` [bug#42885] [PATCH 3/4] gnu: calibre: Update to 4.22.0 Brendan Tildesley
2020-08-16 7:03 ` [bug#42885] [PATCH 4/4] gnu: calibre: Add wrap phase for qtwebengine Brendan Tildesley
2020-08-24 1:01 ` [bug#42885] [PATCH 1/4] gnu: ebook.scm: remove duplicate module import Leo Famulari
2020-08-22 23:24 ` [bug#42885] ([PATCH 2/4] gnu: calibre: Update to 4.23.0 (new release) Brendan Tildesley
2020-08-25 1:59 ` [bug#42885] [PATCH 2/4] gnu: Add mathjax-3 Brendan Tildesley
2020-09-07 3:11 ` [bug#42885] Regarding Patch 4 Prafulla Giri
2020-09-07 3:40 ` Prafulla Giri
2021-03-10 9:00 ` [bug#42885] [PATCH 01/27] gnu: python-sip: Update to 5.5.0. Add python-sip-4 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 02/27] gnu: python2-sip: Fix build Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 03/27] gnu: veusz: " Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 04/27] gnu: Add python-pyqt-builder Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 05/27] gnu: Add python-pyqt5-sip Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 06/27] gnu: python-pyqt: Fix build for new python-sip Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 07/27] gnu: Add python-ifaddr Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 08/27] gnu: Add python-zeroconf Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 09/27] gnu: Add python-pyannotate Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 10/27] gnu: Add python-multivolumefile Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 11/27] gnu: Add python-ppmd-cffi Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 12/27] gnu: python-zstandard: Update to 0.15.2 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 13/27] gnu: Add python-pyzstd Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 14/27] gnu: Add python-bcj-cffi Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 15/27] gnu: Add python-py7zr Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 16/27] gnu: python-markdown: Update to 3.3.4 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 17/27] gnu: python-feedparser: Update to 6.0.2 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 18/27] gnu: python-poppler-qt5: Fix build Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 19/27] gnu: python-poppler-qt5: Update to 21.1.0 Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 20/27] gnu: Add python-pychm Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 21/27] gnu: Add python-cchardet Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 22/27] gnu: python-html5lib: Add python-chardet input Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 23/27] gnu: calibre: Update to 5.13.0 Brendan Tildesley
2021-03-23 18:25 ` Leo Famulari
2021-03-23 18:36 ` Leo Famulari
2021-03-24 2:13 ` Brendan Tildesley
2021-03-29 20:12 ` Leo Famulari
2021-03-29 23:05 ` Leo Famulari
2021-03-30 6:23 ` Brendan Tildesley
2021-04-05 19:58 ` Leo Famulari
2021-04-06 1:30 ` Brendan Tildesley
2021-04-06 17:11 ` Leo Famulari
2021-04-07 3:57 ` Brendan Tildesley
2021-04-08 0:05 ` Leo Famulari
2021-04-08 1:14 ` Leo Famulari
2021-04-08 3:59 ` Leo Famulari
2021-04-08 4:11 ` Brendan Tildesley
2021-04-08 4:28 ` Leo Famulari
2021-04-08 11:17 ` Brendan Tildesley
2021-04-09 20:12 ` bug#42885: " Leo Famulari
2021-03-30 10:45 ` [bug#42885] " Brendan Tildesley
2021-04-04 17:46 ` Leo Famulari
2021-03-10 9:00 ` [bug#42885] [PATCH 24/27] gnu: calibre: Patch some paths Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 25/27] gnu: calibre: Add qtsvg as input Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 26/27] gnu: Remove python2-pyqtwebengine Brendan Tildesley
2021-03-10 9:00 ` [bug#42885] [PATCH 27/27] gnu: Remove python2-pyqt Brendan Tildesley
2021-03-21 7:00 ` Brendan Tildesley via Guix-patches via [this message]
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=2053979569.43243.1616310015760@office.mailbox.org \
--to=guix-patches@gnu.org \
--cc=42885@debbugs.gnu.org \
--cc=btild@mailbox.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.