* [bug#27441] [PATCH] gnu: Update calibre to 3.0.0.
@ 2017-06-21 13:14 Roel Janssen
2017-06-21 14:47 ` Roel Janssen
0 siblings, 1 reply; 4+ messages in thread
From: Roel Janssen @ 2017-06-21 13:14 UTC (permalink / raw)
To: 27441
[-- Attachment #1: Type: text/plain, Size: 410 bytes --]
Dear Guix,
I changed the calibre recipe to accomodate for the changes for 3.0.0.
In the process I replaced one of the patches that removed the external
links to favicons with a substitution. (The patch wouldn't apply
anymore).
So, the following patch updates calibre to 3.0.0. I tested that it
works and that I can copy books to my e-reader. .. And of course that
works fine.
Kind regards,
Roel Janssen
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Update-calibre-to-3.0.0.patch --]
[-- Type: text/x-patch, Size: 5409 bytes --]
From bcfa19ed4b97b347e851ff17d1db3f60a4c24b62 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Wed, 21 Jun 2017 15:05:29 +0200
Subject: [PATCH] gnu: Update calibre to 3.0.0.
* gnu/packages/patches/calibre-dont-load-remote-icons.patch: Remove file.
* gnu/packages/ebook.scm: Update calibre to 3.0.0.
---
gnu/packages/ebook.scm | 12 ++++--
.../patches/calibre-dont-load-remote-icons.patch | 45 ----------------------
2 files changed, 8 insertions(+), 49 deletions(-)
delete mode 100644 gnu/packages/patches/calibre-dont-load-remote-icons.patch
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 1d64e9b69..ff8c6aae2 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -65,7 +65,7 @@
(define-public calibre
(package
(name "calibre")
- (version "2.85.1")
+ (version "3.0.0")
(source
(origin
(method url-fetch)
@@ -74,7 +74,7 @@
version ".tar.xz"))
(sha256
(base32
- "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc"))
+ "1zhk7bvgr973dd18x4wp48kzai29qqqi5qcy72sxc4wcbk2sbnkw"))
;; Remove non-free or doubtful code, see
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
(modules '((guix build utils)))
@@ -84,13 +84,11 @@
(delete-file-recursively "src/unrar")
(delete-file "src/odf/thumbnail.py")
(delete-file-recursively "resources/fonts/liberation")
- (delete-file-recursively "src/chardet")
(substitute* (find-files "." "\\.py")
(("calibre\\.ebooks\\.markdown") "markdown"))
#t))
(patches (search-patches "calibre-drop-unrar.patch"
"calibre-use-packaged-feedparser.patch"
- "calibre-dont-load-remote-icons.patch"
"calibre-no-updates-dialog.patch"))))
(build-system python-build-system)
(native-inputs
@@ -132,6 +130,7 @@
("python2-pygments" ,python2-pygments)
("python2-pyqt" ,python2-pyqt)
("python2-sip" ,python2-sip)
+ ("python2-regex" ,python2-regex)
("sqlite" ,sqlite)))
(arguments
`(#:python ,python-2
@@ -148,6 +147,11 @@
;; We can't use the uninstaller in Guix. Don't build it.
(("self\\.create_uninstaller()") ""))
#t))
+ (add-after 'unpack 'dont-load-remote-icons
+ (lambda _
+ (substitute* "setup/plugins_mirror.py"
+ (("href=\"//calibre-ebook.com/favicon.ico\"")
+ "href=\"favicon.ico\""))))
(add-before 'build 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((podofo (assoc-ref inputs "podofo"))
diff --git a/gnu/packages/patches/calibre-dont-load-remote-icons.patch b/gnu/packages/patches/calibre-dont-load-remote-icons.patch
deleted file mode 100644
index 216826307..000000000
--- a/gnu/packages/patches/calibre-dont-load-remote-icons.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Martin Pitt <mpitt@debian.org>
-Date: Mon, 14 Nov 2016 22:41:24 +0100
-Subject: content-server: Don't load external URLs for privacy
-
-Spotted by lintian.
----
- resources/content_server/browse/browse.html | 4 +---
- resources/content_server/index.html | 2 +-
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
-index 36f7199..e615707 100644
---- a/resources/content_server/browse/browse.html
-+++ b/resources/content_server/browse/browse.html
-@@ -7,7 +7,7 @@
- <title>..:: calibre {library} ::.. {title}</title>
- <meta http-equiv="X-UA-Compatible" content="IE=100" />
- <meta name="robots" content="noindex" />
-- <link rel="icon" type="image/x-icon" href="//calibre-ebook.com/favicon.ico" />
-+ <link rel="icon" type="image/x-icon" href="favicon.ico" />
-
- <link rel="stylesheet" type="text/css" href="{prefix}/static/browse/browse.css" />
- <link type="text/css" href="{prefix}/static/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css" rel="stylesheet" />
-@@ -63,8 +63,6 @@
- <input type="image"
- src="{prefix}/static/button-donate.png"
- name="submit"></input>
-- <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
-- width="1" height="1"></img>
- </div>
- </form>
- <div id="calibre-home-link" title="Go to the calibre website"></div>
-diff --git a/resources/content_server/index.html b/resources/content_server/index.html
-index 51cc33a..e71d0e8 100644
---- a/resources/content_server/index.html
-+++ b/resources/content_server/index.html
-@@ -9,7 +9,7 @@
- <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script>
- <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script>
- <script type="text/javascript" src="{prefix}/static/gui.js" charset="utf-8"></script>
-- <link rel="icon" href="//calibre-ebook.com/favicon.ico" type="image/x-icon" />
-+ <link rel="icon" href="favicon.ico" type="image/x-icon" />
- </head>
- <body>
- <div id="banner">
--
2.13.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#27441] [PATCH] gnu: Update calibre to 3.0.0.
2017-06-21 13:14 [bug#27441] [PATCH] gnu: Update calibre to 3.0.0 Roel Janssen
@ 2017-06-21 14:47 ` Roel Janssen
2017-06-21 19:36 ` Ludovic Courtès
0 siblings, 1 reply; 4+ messages in thread
From: Roel Janssen @ 2017-06-21 14:47 UTC (permalink / raw)
To: 27441
[-- Attachment #1: Type: text/plain, Size: 131 bytes --]
Dear Guix,
I forgot to remove the patch from local.mk.
Here's a new patch that includes this change.
Kind regards,
Roel Janssen
[-- Attachment #2: 0001-gnu-Update-calibre-to-3.0.0.patch --]
[-- Type: text/x-patch, Size: 6366 bytes --]
From bbdc3f943d48d92c7be3aee6891dcfb26ba5b186 Mon Sep 17 00:00:00 2001
From: Roel Janssen <roel@gnu.org>
Date: Wed, 21 Jun 2017 16:44:56 +0200
Subject: [PATCH] gnu: Update calibre to 3.0.0.
* gnu/local.mk: Remove patch.
* gnu/packages/ebook.scm (calibre): Update to 3.0.0.
* gnu/packages/patches/calibre-dont-load-remote-icons.patch: Remove file.
---
gnu/local.mk | 1 -
gnu/packages/ebook.scm | 13 +++++--
.../patches/calibre-dont-load-remote-icons.patch | 45 ----------------------
3 files changed, 9 insertions(+), 50 deletions(-)
delete mode 100644 gnu/packages/patches/calibre-dont-load-remote-icons.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f0eed694d..88ea8daf4 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -522,7 +522,6 @@ dist_patch_DATA = \
%D%/packages/patches/byobu-writable-status.patch \
%D%/packages/patches/cairo-CVE-2016-9082.patch \
%D%/packages/patches/calibre-drop-unrar.patch \
- %D%/packages/patches/calibre-dont-load-remote-icons.patch \
%D%/packages/patches/calibre-no-updates-dialog.patch \
%D%/packages/patches/calibre-use-packaged-feedparser.patch \
%D%/packages/patches/cdparanoia-fpic.patch \
diff --git a/gnu/packages/ebook.scm b/gnu/packages/ebook.scm
index 1d64e9b69..d0bed0ea1 100644
--- a/gnu/packages/ebook.scm
+++ b/gnu/packages/ebook.scm
@@ -3,6 +3,7 @@
;;; Copyright © 2016 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>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -65,7 +66,7 @@
(define-public calibre
(package
(name "calibre")
- (version "2.85.1")
+ (version "3.0.0")
(source
(origin
(method url-fetch)
@@ -74,7 +75,7 @@
version ".tar.xz"))
(sha256
(base32
- "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc"))
+ "1zhk7bvgr973dd18x4wp48kzai29qqqi5qcy72sxc4wcbk2sbnkw"))
;; Remove non-free or doubtful code, see
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
(modules '((guix build utils)))
@@ -84,13 +85,11 @@
(delete-file-recursively "src/unrar")
(delete-file "src/odf/thumbnail.py")
(delete-file-recursively "resources/fonts/liberation")
- (delete-file-recursively "src/chardet")
(substitute* (find-files "." "\\.py")
(("calibre\\.ebooks\\.markdown") "markdown"))
#t))
(patches (search-patches "calibre-drop-unrar.patch"
"calibre-use-packaged-feedparser.patch"
- "calibre-dont-load-remote-icons.patch"
"calibre-no-updates-dialog.patch"))))
(build-system python-build-system)
(native-inputs
@@ -132,6 +131,7 @@
("python2-pygments" ,python2-pygments)
("python2-pyqt" ,python2-pyqt)
("python2-sip" ,python2-sip)
+ ("python2-regex" ,python2-regex)
("sqlite" ,sqlite)))
(arguments
`(#:python ,python-2
@@ -148,6 +148,11 @@
;; We can't use the uninstaller in Guix. Don't build it.
(("self\\.create_uninstaller()") ""))
#t))
+ (add-after 'unpack 'dont-load-remote-icons
+ (lambda _
+ (substitute* "setup/plugins_mirror.py"
+ (("href=\"//calibre-ebook.com/favicon.ico\"")
+ "href=\"favicon.ico\""))))
(add-before 'build 'configure
(lambda* (#:key inputs #:allow-other-keys)
(let ((podofo (assoc-ref inputs "podofo"))
diff --git a/gnu/packages/patches/calibre-dont-load-remote-icons.patch b/gnu/packages/patches/calibre-dont-load-remote-icons.patch
deleted file mode 100644
index 216826307..000000000
--- a/gnu/packages/patches/calibre-dont-load-remote-icons.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From: Martin Pitt <mpitt@debian.org>
-Date: Mon, 14 Nov 2016 22:41:24 +0100
-Subject: content-server: Don't load external URLs for privacy
-
-Spotted by lintian.
----
- resources/content_server/browse/browse.html | 4 +---
- resources/content_server/index.html | 2 +-
- 2 files changed, 2 insertions(+), 4 deletions(-)
-
-diff --git a/resources/content_server/browse/browse.html b/resources/content_server/browse/browse.html
-index 36f7199..e615707 100644
---- a/resources/content_server/browse/browse.html
-+++ b/resources/content_server/browse/browse.html
-@@ -7,7 +7,7 @@
- <title>..:: calibre {library} ::.. {title}</title>
- <meta http-equiv="X-UA-Compatible" content="IE=100" />
- <meta name="robots" content="noindex" />
-- <link rel="icon" type="image/x-icon" href="//calibre-ebook.com/favicon.ico" />
-+ <link rel="icon" type="image/x-icon" href="favicon.ico" />
-
- <link rel="stylesheet" type="text/css" href="{prefix}/static/browse/browse.css" />
- <link type="text/css" href="{prefix}/static/jquery_ui/css/humanity-custom/jquery-ui-1.8.5.custom.css" rel="stylesheet" />
-@@ -63,8 +63,6 @@
- <input type="image"
- src="{prefix}/static/button-donate.png"
- name="submit"></input>
-- <img alt="" src="https://www.paypal.com/en_US/i/scr/pixel.gif"
-- width="1" height="1"></img>
- </div>
- </form>
- <div id="calibre-home-link" title="Go to the calibre website"></div>
-diff --git a/resources/content_server/index.html b/resources/content_server/index.html
-index 51cc33a..e71d0e8 100644
---- a/resources/content_server/index.html
-+++ b/resources/content_server/index.html
-@@ -9,7 +9,7 @@
- <script type="text/javascript" src="{prefix}/static/date.js" charset="utf-8"></script>
- <script type="text/javascript" src="{prefix}/static/jquery.js" charset="utf-8"></script>
- <script type="text/javascript" src="{prefix}/static/gui.js" charset="utf-8"></script>
-- <link rel="icon" href="//calibre-ebook.com/favicon.ico" type="image/x-icon" />
-+ <link rel="icon" href="favicon.ico" type="image/x-icon" />
- </head>
- <body>
- <div id="banner">
--
2.13.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [bug#27441] [PATCH] gnu: Update calibre to 3.0.0.
2017-06-21 14:47 ` Roel Janssen
@ 2017-06-21 19:36 ` Ludovic Courtès
2017-06-21 22:12 ` bug#27441: " Roel Janssen
0 siblings, 1 reply; 4+ messages in thread
From: Ludovic Courtès @ 2017-06-21 19:36 UTC (permalink / raw)
To: Roel Janssen; +Cc: 27441
Roel Janssen <roel@gnu.org> skribis:
> From bbdc3f943d48d92c7be3aee6891dcfb26ba5b186 Mon Sep 17 00:00:00 2001
> From: Roel Janssen <roel@gnu.org>
> Date: Wed, 21 Jun 2017 16:44:56 +0200
> Subject: [PATCH] gnu: Update calibre to 3.0.0.
>
> * gnu/local.mk: Remove patch.
> * gnu/packages/ebook.scm (calibre): Update to 3.0.0.
> * gnu/packages/patches/calibre-dont-load-remote-icons.patch: Remove file.
[...]
> + (add-after 'unpack 'dont-load-remote-icons
> + (lambda _
> + (substitute* "setup/plugins_mirror.py"
> + (("href=\"//calibre-ebook.com/favicon.ico\"")
> + "href=\"favicon.ico\""))))
Make sure to return #t.
Other than that, if it works for you, I say go for it!
Thanks,
Ludo’.
^ permalink raw reply [flat|nested] 4+ messages in thread
* bug#27441: [PATCH] gnu: Update calibre to 3.0.0.
2017-06-21 19:36 ` Ludovic Courtès
@ 2017-06-21 22:12 ` Roel Janssen
0 siblings, 0 replies; 4+ messages in thread
From: Roel Janssen @ 2017-06-21 22:12 UTC (permalink / raw)
To: Ludovic Courtès; +Cc: 27441-done
Ludovic Courtès writes:
> Roel Janssen <roel@gnu.org> skribis:
>
>> From bbdc3f943d48d92c7be3aee6891dcfb26ba5b186 Mon Sep 17 00:00:00 2001
>> From: Roel Janssen <roel@gnu.org>
>> Date: Wed, 21 Jun 2017 16:44:56 +0200
>> Subject: [PATCH] gnu: Update calibre to 3.0.0.
>>
>> * gnu/local.mk: Remove patch.
>> * gnu/packages/ebook.scm (calibre): Update to 3.0.0.
>> * gnu/packages/patches/calibre-dont-load-remote-icons.patch: Remove file.
>
> [...]
>
>> + (add-after 'unpack 'dont-load-remote-icons
>> + (lambda _
>> + (substitute* "setup/plugins_mirror.py"
>> + (("href=\"//calibre-ebook.com/favicon.ico\"")
>> + "href=\"favicon.ico\""))))
>
> Make sure to return #t.
>
> Other than that, if it works for you, I say go for it!
I added the #t to the end of the lambda and pushed in f70f3407.
Thanks!
Kind regards,
Roel Janssen
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-06-21 22:13 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-06-21 13:14 [bug#27441] [PATCH] gnu: Update calibre to 3.0.0 Roel Janssen
2017-06-21 14:47 ` Roel Janssen
2017-06-21 19:36 ` Ludovic Courtès
2017-06-21 22:12 ` bug#27441: " Roel Janssen
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).