diff options
Diffstat (limited to 'libre/calibre/libre.patch')
-rw-r--r-- | libre/calibre/libre.patch | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index 4b492532e..604551295 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -143,9 +143,9 @@ diff -Nur calibre-2.45.0.orig/src/calibre/constants.py calibre-2.45.0/src/calibr 'qt_hack', '_regex', 'hunspell', -diff -Nur calibre-2.34.0.orig/src/calibre/customize/builtins.py calibre-2.34.0/src/calibre/customize/builtins.py ---- calibre-2.34.0.orig/src/calibre/customize/builtins.py 2015-08-07 01:09:19.000000000 -0300 -+++ calibre-2.34.0/src/calibre/customize/builtins.py 2015-08-11 16:40:39.533800794 -0300 +diff -Nur calibre-2.50.1.orig/src/calibre/customize/builtins.py calibre-2.50.1/src/calibre/customize/builtins.py +--- calibre-2.50.1.orig/src/calibre/customize/builtins.py 2016-01-29 14:47:09.000000000 -0300 ++++ calibre-2.50.1/src/calibre/customize/builtins.py 2016-01-31 18:02:55.768011199 -0300 @@ -127,7 +127,7 @@ class ComicMetadataReader(MetadataReaderPlugin): @@ -155,7 +155,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/customize/builtins.py calibre-2.34.0/s description = _('Extract cover from comic files') def customization_help(self, gui=False): -@@ -138,14 +138,8 @@ +@@ -138,19 +138,14 @@ pos = stream.tell() id_ = stream.read(3) stream.seek(pos) @@ -165,14 +165,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/customize/builtins.py calibre-2.34.0/s + if id_.startswith(b'PK'): ftype = 'cbz' - if ftype == 'cbr': -- from calibre.utils.unrar import extract_first_alphabetically as extract_first -- extract_first +- from calibre.utils.unrar import extract_cover_image - else: - from calibre.libunzip import extract_member - extract_first = functools.partial(extract_member, - sort_alphabetically=True) -@@ -153,7 +147,7 @@ - ret = extract_first(stream) + from calibre.libunzip import extract_cover_image + from calibre.ebooks.metadata import MetaInformation + ret = extract_cover_image(stream) mi = MetaInformation(None, None) stream.seek(0) - if ftype in {'cbr', 'cbz'}: @@ -180,7 +177,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/customize/builtins.py calibre-2.34.0/s series_index = self.site_customization if series_index not in {'volume', 'issue'}: series_index = 'volume' -@@ -336,16 +330,6 @@ +@@ -333,16 +328,6 @@ from calibre.ebooks.metadata.pml import get_metadata return get_metadata(stream) @@ -197,10 +194,10 @@ diff -Nur calibre-2.34.0.orig/src/calibre/customize/builtins.py calibre-2.34.0/s class RBMetadataReader(MetadataReaderPlugin): name = 'Read RB metadata' -diff -Nur calibre-2.49.0.orig/src/calibre/customize/ui.py calibre-2.49.0/src/calibre/customize/ui.py ---- calibre-2.49.0.orig/src/calibre/customize/ui.py 2016-01-14 23:48:37.000000000 -0300 -+++ calibre-2.49.0/src/calibre/customize/ui.py 2016-01-15 19:47:49.867135874 -0300 -@@ -457,7 +457,7 @@ +diff -Nur calibre-2.50.1.orig/src/calibre/customize/ui.py calibre-2.50.1/src/calibre/customize/ui.py +--- calibre-2.50.1.orig/src/calibre/customize/ui.py 2016-01-29 14:47:09.000000000 -0300 ++++ calibre-2.50.1/src/calibre/customize/ui.py 2016-01-31 18:00:13.083099717 -0300 +@@ -458,7 +458,7 @@ if not is_disabled(plugin): for format in plugin.file_types: formats.add(format) |