From d065252ef577fa925b901b81a0da46178ec49b65 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 11 Feb 2017 15:48:21 -0300 Subject: calibre-2.79.0-1.parabola1: updating version --- libre/calibre/libre.patch | 84 ++++++++++++++++++++++++----------------------- 1 file changed, 43 insertions(+), 41 deletions(-) (limited to 'libre/calibre/libre.patch') diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index c9ab686e9..ace7034e3 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -1,8 +1,8 @@ diff --git a/resources/images.qrc b/resources/images.qrc -index 07c9892..b323df9 100644 +index c52874b78..2fee5e138 100644 --- a/resources/images.qrc +++ b/resources/images.qrc -@@ -194,8 +194,6 @@ +@@ -197,8 +197,6 @@ images/mimetypes/svg.png images/mimetypes/odt.png images/mimetypes/epub.png @@ -11,7 +11,7 @@ index 07c9892..b323df9 100644 images/mimetypes/tpz.png images/mimetypes/djvu.png images/mimetypes/computer.png -@@ -215,4 +213,4 @@ +@@ -218,4 +216,4 @@ images/mimetypes/html.png images/mimetypes/lrx.png @@ -19,7 +19,7 @@ index 07c9892..b323df9 100644 \ No newline at end of file + diff --git a/resources/mime.types b/resources/mime.types -index b8acaaa..9ea4742 100644 +index b8acaaa25..9ea4742a6 100644 --- a/resources/mime.types +++ b/resources/mime.types @@ -138,7 +138,6 @@ application/prs.cww cww @@ -47,7 +47,7 @@ index b8acaaa..9ea4742 100644 application/x-cbc cbc application/x-koboreader-ebook kobo diff --git a/session.vim b/session.vim -index d5ecb06..b3e40d0 100644 +index d5ecb06a3..b3e40d0da 100644 --- a/session.vim +++ b/session.vim @@ -11,7 +11,6 @@ let g:syntastic_cpp_include_dirs = [ @@ -59,10 +59,10 @@ index d5ecb06..b3e40d0 100644 \'/usr/include/ImageMagick', \] diff --git a/setup/extensions.json b/setup/extensions.json -index 6f3e7d9..3ba2c85 100644 +index 1f6d1fb5f..127390450 100644 --- a/setup/extensions.json +++ b/setup/extensions.json -@@ -211,14 +211,5 @@ +@@ -211,16 +211,5 @@ "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", "libraries": "mtp" @@ -73,12 +73,14 @@ index 6f3e7d9..3ba2c85 100644 - "inc_dirs": "unrar", - "defines": "SILENT RARDLL UNRAR _FILE_OFFSET_BITS=64 _LARGEFILE_SOURCE", - "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, - "windows_libraries": "User32 Advapi32 kernel32 Shell32" } ] diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py -index 539ec35..f0537d9 100644 +index 539ec35ff..f0537d916 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -674,7 +674,7 @@ class Win32Freeze(Command, WixMixIn): @@ -91,10 +93,10 @@ index 539ec35..f0537d9 100644 # dupypy crashes when loaded from the zip file 'dukpy.pyd', diff --git a/setup/resources.py b/setup/resources.py -index 6a0d122..52fc25f 100644 +index d3c9614c6..6946b93f4 100644 --- a/setup/resources.py +++ b/setup/resources.py -@@ -363,7 +363,7 @@ class Resources(Command): # {{{ +@@ -364,7 +364,7 @@ class Resources(Command): # {{{ log = Log() # log.outputs = [] for inf in supported_input_formats(): @@ -104,10 +106,10 @@ index 6a0d122..52fc25f 100644 for ouf in available_output_formats(): of = ouf if ouf == 'oeb' else 'dummy.'+ouf diff --git a/src/calibre/__init__.py b/src/calibre/__init__.py -index c37c0fc..54d4d96 100644 +index dfd897ba0..105578388 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py -@@ -291,10 +291,7 @@ def extract(path, dir): +@@ -292,10 +292,7 @@ def extract(path, dir): # First use the file header to identify its type with open(path, 'rb') as f: id_ = f.read(3) @@ -119,7 +121,7 @@ index c37c0fc..54d4d96 100644 from calibre.libunzip import extract as zipextract extractor = zipextract if extractor is None: -@@ -303,9 +300,6 @@ def extract(path, dir): +@@ -304,9 +301,6 @@ def extract(path, dir): if ext in ['zip', 'cbz', 'epub', 'oebzip']: from calibre.libunzip import extract as zipextract extractor = zipextract @@ -130,10 +132,10 @@ index c37c0fc..54d4d96 100644 raise Exception('Unknown archive type') extractor(path, dir) diff --git a/src/calibre/constants.py b/src/calibre/constants.py -index 5aa6c9e..57aae3e 100644 +index 3952b06da..87e42b4a8 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py -@@ -147,7 +147,6 @@ class Plugins(collections.Mapping): +@@ -154,7 +154,6 @@ class Plugins(collections.Mapping): 'zlib2', 'html', 'freetype', @@ -142,7 +144,7 @@ index 5aa6c9e..57aae3e 100644 'qt_hack', '_regex', diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py -index 102bc81..25a877c 100644 +index 102bc8149..25a877c02 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -131,7 +131,7 @@ plugins += [HTML2ZIP, PML2PMLZ, TXT2TXTZ, ArchiveExtract,] @@ -195,10 +197,10 @@ index 102bc81..25a877c 100644 name = 'Read RB metadata' diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py -index 94f972f..019ab03 100644 +index 9b5eb17fb..87233d03b 100644 --- a/src/calibre/customize/ui.py +++ b/src/calibre/customize/ui.py -@@ -518,7 +518,7 @@ def available_input_formats(): +@@ -526,7 +526,7 @@ def available_input_formats(): if not is_disabled(plugin): for format in plugin.file_types: formats.add(format) @@ -208,7 +210,7 @@ index 94f972f..019ab03 100644 diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py -index 2ba1a0d..7df2e36 100644 +index a4bc8639b..ae9e437e9 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -78,7 +78,7 @@ class KOBO(USBMS): @@ -221,7 +223,7 @@ index 2ba1a0d..7df2e36 100644 VENDOR_ID = [0x2237] diff --git a/src/calibre/devices/mtp/filesystem_cache.py b/src/calibre/devices/mtp/filesystem_cache.py -index ffc5280..79be51e 100644 +index ffc52806d..79be51ed7 100644 --- a/src/calibre/devices/mtp/filesystem_cache.py +++ b/src/calibre/devices/mtp/filesystem_cache.py @@ -18,7 +18,7 @@ from calibre.utils.date import local_tz, as_utc @@ -234,13 +236,13 @@ index ffc5280..79be51e 100644 class FileOrFolder(object): diff --git a/src/calibre/ebooks/__init__.py b/src/calibre/ebooks/__init__.py -index c21fec5..ec04092 100644 +index 785d964ed..f8c01e55b 100644 --- a/src/calibre/ebooks/__init__.py +++ b/src/calibre/ebooks/__init__.py -@@ -29,9 +29,9 @@ class DRMError(ValueError): - class ParserError(ValueError): +@@ -30,9 +30,9 @@ class ParserError(ValueError): pass + -BOOK_EXTENSIONS = ['lrf', 'rar', 'zip', 'rtf', 'lit', 'txt', 'txtz', 'text', 'htm', 'xhtm', +BOOK_EXTENSIONS = ['lrf', 'zip', 'rtf', 'lit', 'txt', 'txtz', 'text', 'htm', 'xhtm', 'html', 'htmlz', 'xhtml', 'pdf', 'pdb', 'updb', 'pdr', 'prc', 'mobi', 'azw', 'doc', @@ -250,7 +252,7 @@ index c21fec5..ec04092 100644 'xps', 'oxps', 'azw4', 'book', 'zbf', 'pobi', 'docx', 'docm', 'md', 'textile', 'markdown', 'ibook', 'ibooks', 'iba', 'azw3', 'ps', 'kepub'] diff --git a/src/calibre/ebooks/conversion/plugins/comic_input.py b/src/calibre/ebooks/conversion/plugins/comic_input.py -index 8825014..acc1f1b 100644 +index 882501462..acc1f1bd3 100644 --- a/src/calibre/ebooks/conversion/plugins/comic_input.py +++ b/src/calibre/ebooks/conversion/plugins/comic_input.py @@ -18,8 +18,8 @@ class ComicInput(InputFormatPlugin): @@ -265,7 +267,7 @@ index 8825014..acc1f1b 100644 core_usage = -1 diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py -index 1a3e6e5..8ee9479 100644 +index f85199a01..c429f1130 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -43,7 +43,7 @@ various stages of conversion. The stages are: @@ -277,17 +279,17 @@ index 1a3e6e5..8ee9479 100644 fmts.add(x) return fmts -@@ -63,7 +63,7 @@ class CompositeProgressReporter(object): - (self.global_max - self.global_min) +@@ -64,7 +64,7 @@ class CompositeProgressReporter(object): self.global_reporter(global_frac, msg) + -ARCHIVE_FMTS = ('zip', 'rar', 'oebzip') +ARCHIVE_FMTS = ('zip', 'oebzip') class Plumber(object): diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py -index 938ab24..0494bc5 100644 +index 938ab24bc..0494bc5e3 100644 --- a/src/calibre/ebooks/metadata/archive.py +++ b/src/calibre/ebooks/metadata/archive.py @@ -29,8 +29,6 @@ def archive_type(stream): @@ -365,7 +367,7 @@ index 938ab24..0494bc5 100644 if comment: import json diff --git a/src/calibre/ebooks/oeb/iterator/book.py b/src/calibre/ebooks/oeb/iterator/book.py -index f419c00..f876fa2 100644 +index 08208c915..ff37b807f 100644 --- a/src/calibre/ebooks/oeb/iterator/book.py +++ b/src/calibre/ebooks/oeb/iterator/book.py @@ -152,7 +152,7 @@ class EbookIterator(BookmarksMixin): @@ -378,7 +380,7 @@ index f419c00..f876fa2 100644 spath = i.path mt = None diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py -index c0980b5..db56ca5 100644 +index d2f628294..c1a92b8dd 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -39,8 +39,8 @@ def get_filters(): @@ -411,7 +413,7 @@ index c0980b5..db56ca5 100644 self.do_add_recursive(paths, single, list_of_archives=True) diff --git a/src/calibre/gui2/add.py b/src/calibre/gui2/add.py -index 5adb286..b60f2a9 100644 +index 5adb28604..b60f2a9fc 100644 --- a/src/calibre/gui2/add.py +++ b/src/calibre/gui2/add.py @@ -147,9 +147,6 @@ class Adder(QObject): @@ -425,7 +427,7 @@ index 5adb286..b60f2a9 100644 try: diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py -index 34157a0..718af59 100644 +index 34157a0c5..718af59f1 100644 --- a/src/calibre/library/server/opds.py +++ b/src/calibre/library/server/opds.py @@ -28,7 +28,7 @@ BASE_HREFS = { @@ -438,10 +440,10 @@ index 34157a0..718af59 100644 def url_for(name, version, **kwargs): diff --git a/src/calibre/linux.py b/src/calibre/linux.py -index 31a1155..0cb6385 100644 +index a098ea630..163aa38bc 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py -@@ -315,7 +315,7 @@ class ZshCompleter(object): # {{{ +@@ -317,7 +317,7 @@ class ZshCompleter(object): # {{{ ): for fmt in fmts: is_input = group_title == input_group @@ -451,10 +453,10 @@ index 31a1155..0cb6385 100644 p = (get_parser(input_fmt=fmt) if is_input else get_parser(output_fmt=fmt)) diff --git a/src/calibre/test_build.py b/src/calibre/test_build.py -index 85829e5..ecacb67 100644 +index f11c08b26..3176389b8 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py -@@ -169,10 +169,6 @@ class BuildTest(unittest.TestCase): +@@ -168,10 +168,6 @@ class BuildTest(unittest.TestCase): from calibre.gui2.win_file_dialogs import test test() @@ -466,7 +468,7 @@ index 85829e5..ecacb67 100644 def test_wpd(self): wpd = plugins['wpd'][0] diff --git a/src/calibre/utils/search_query_parser.py b/src/calibre/utils/search_query_parser.py -index fe04af0..130fb81 100644 +index fe04af0b3..130fb81ec 100644 --- a/src/calibre/utils/search_query_parser.py +++ b/src/calibre/utils/search_query_parser.py @@ -455,16 +455,16 @@ class Tester(SearchQueryParser): @@ -669,7 +671,7 @@ index fe04af0..130fb81 100644 tests = { diff --git a/src/calibre/web/feeds/feedparser.py b/src/calibre/web/feeds/feedparser.py -index 16085cf..420efaa 100755 +index 16085cf53..420efaa25 100755 --- a/src/calibre/web/feeds/feedparser.py +++ b/src/calibre/web/feeds/feedparser.py @@ -2081,7 +2081,7 @@ class _MicroformatsParser: @@ -682,10 +684,10 @@ index 16085cf..420efaa 100755 def __init__(self, data, baseuri, encoding): self.document = BeautifulSoup.BeautifulSoup(data) diff --git a/translations/calibre/main.pot b/translations/calibre/main.pot -index 7d1f7c9..d02335b 100644 +index fc85e1b7a..87b62caf3 100644 --- a/translations/calibre/main.pot +++ b/translations/calibre/main.pot -@@ -4415,7 +4415,7 @@ msgid "Set book ID" +@@ -4424,7 +4424,7 @@ msgid "Set book ID" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:44 @@ -694,7 +696,7 @@ index 7d1f7c9..d02335b 100644 msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:655 -@@ -12801,7 +12801,7 @@ msgid "You can also customise the plugin locations using Preferences -> Custo +@@ -12888,7 +12888,7 @@ msgid "You can also customise the plugin locations using Preferences -> Custo msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:36 -- cgit v1.2.3