me/guix
Archived
1
0
Fork 0
Code Activity

gnu: calibre: Update to 2.85.1.

Browse source 
* gnu/packages/ebooks.scm (calibre): Update to 2.85.1.
* gnu/packages/patches/calibre-drop-unrar.patch: Delete incompatible patch
file. Recreate debian patch file from the latest calibre git revision.

Signed-off-by: Marius Bakke <mbakke@fastmail.com>
This commit is contained in:
Brendan Tildesley 2017-05-13 20:40:45 +10:00 • committed by Marius Bakke
parent b55dd31660
commit cd6171c1b4
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
2 changed files with 31 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
gnu/packages/ebook.scm
View file

@ -2,6 +2,7 @@
;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr> ;;; Copyright © 2015, 2016 Andreas Enge <andreas@enge.fr>
;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com> ;;; Copyright © 2016, 2017 Alex Griffin <a@ajgrf.com>
;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -61,7 +62,7 @@
(define-public calibre (define-public calibre
(package (package
(name "calibre") (name "calibre")
(version "2.76.0") (version "2.85.1")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
@ -70,7 +71,7 @@
version ".tar.xz")) version ".tar.xz"))
(sha256 (sha256
(base32 (base32
"1xfm586n6gm44mkyn25mbiyhj6w9ji9yl6fvmnr4zk1q6qcga3v8")) "1g8s0kp1gj05yysfgqpp2lgrxvzc0fsny1hwzx5jh9hvqn0b53cc"))
;; Remove non-free or doubtful code, see ;; Remove non-free or doubtful code, see
;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html ;; https://lists.gnu.org/archive/html/guix-devel/2015-02/msg00478.html
(modules '((guix build utils))) (modules '((guix build utils)))

48
gnu/packages/patches/calibre-drop-unrar.patch
View file

@ -1,15 +1,20 @@
Taken from Debian. Updated by Alex Griffin. Recreated old debian patch on the latest calibre version
Author: Dmitry Shachnev <mitya57@gmail.com> From 6764e4c211e50d4f4633dbabfba7cbc3089c51dc Mon Sep 17 00:00:00 2001
Description: do not build unrar extension as we strip unrar from the tarball From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
Forwarded: not-needed Date: Sat, 13 May 2017 21:12:12 +1000
Last-Update: 2013-04-04 Subject: [PATCH] Remove unrar extension
Index: calibre/setup/extensions.py ---
=================================================================== setup/extensions.json | 11 -----------
--- calibre.orig/setup/extensions.json 2016-07-21 21:21:05.000000000 -0500 src/calibre/ebooks/metadata/archive.py | 2 +-
+++ calibre/setup/extensions.json 2016-07-27 11:22:17.167710112 -0500 2 files changed, 1 insertion(+), 12 deletions(-)
@@ -211,14 +211,5 @@
diff --git a/setup/extensions.json b/setup/extensions.json
index 1f6d1fb5fd..127390450f 100644
--- a/setup/extensions.json
+++ b/setup/extensions.json
@@ -211,16 +211,5 @@
"sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c", "sources": "calibre/devices/mtp/unix/devices.c calibre/devices/mtp/unix/libmtp.c",
"headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h", "headers": "calibre/devices/mtp/unix/devices.h calibre/devices/mtp/unix/upstream/music-players.h calibre/devices/mtp/unix/upstream/device-flags.h",
"libraries": "mtp" "libraries": "mtp"
@ -20,22 +25,25 @@ Index: calibre/setup/extensions.py
- "inc_dirs": "unrar", - "inc_dirs": "unrar",
- "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE", - "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE",
- "windows_defines": "SILENT RARDLL UNRAR", - "windows_defines": "SILENT RARDLL UNRAR",
- "haiku_defines": "LITTLE_ENDIAN SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE _BSD_SOURCE",
- "haiku_libraries": "bsd",
- "optimize_level": 2, - "optimize_level": 2,
- "windows_libraries": "User32 Advapi32 kernel32 Shell32" - "windows_libraries": "User32 Advapi32 kernel32 Shell32"
} }
] ]
diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
index f5c0b7bed3..32257dcdae 100644
Index: calibre/src/calibre/ebooks/metadata/archive.py --- a/src/calibre/ebooks/metadata/archive.py
=================================================================== +++ b/src/calibre/ebooks/metadata/archive.py
--- calibre.orig/src/calibre/ebooks/metadata/archive.py 2016-07-21 21:21:05.000000000 -0500 @@ -44,7 +44,7 @@ class ArchiveExtract(FileTypePlugin):
+++ calibre/src/calibre/ebooks/metadata/archive.py 2016-07-27 11:21:07.793616039 -0500 description = _('Extract common e-book formats from archive files '
@@ -42,7 +42,7 @@ '(ZIP/RAR). Also try to autodetect if they are actually '
description = _('Extract common e-book formats from archives ' 'CBZ/CBR files.')
'(zip/rar) files. Also try to autodetect if they are actually '
'cbz/cbr files.')
- file_types = set(['zip', 'rar']) - file_types = set(['zip', 'rar'])
+ file_types = set(['zip']) + file_types = set(['zip'])
supported_platforms = ['windows', 'osx', 'linux'] supported_platforms = ['windows', 'osx', 'linux']
on_import = True on_import = True
--
2.12.2