diff options
Diffstat (limited to 'libre/calibre/libre.patch')
| -rw-r--r-- | libre/calibre/libre.patch | 129 |
1 files changed, 60 insertions, 69 deletions
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index e899c836a..7de696940 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -1,22 +1,26 @@ diff --git a/resources/images.qrc b/resources/images.qrc -index ef1d715..20da7fc 100644 +index 4d00c27..0e6eea1 100644 --- a/resources/images.qrc +++ b/resources/images.qrc -@@ -183,11 +183,9 @@ - <file>images/mimetypes/html.png</file> - <file>images/mimetypes/xps.png</file> - <file>images/mimetypes/svg.png</file> +@@ -115,7 +115,6 @@ + <file>images/mimetypes/azw2.png</file> + <file>images/mimetypes/azw3.png</file> + <file>images/mimetypes/bmp.png</file> -<file>images/mimetypes/cbr.png</file> - <file>images/mimetypes/tpz.png</file> - <file>images/mimetypes/snb.png</file> + <file>images/mimetypes/cbz.png</file> + <file>images/mimetypes/computer.png</file> + <file>images/mimetypes/dir.png</file> +@@ -134,7 +133,6 @@ + <file>images/mimetypes/opml.png</file> + <file>images/mimetypes/pdf.png</file> <file>images/mimetypes/png.png</file> -<file>images/mimetypes/rar.png</file> - <file>images/mimetypes/mobi.png</file> - <file>images/mimetypes/gif.png</file> - <file>images/mimetypes/pdf.png</file> -@@ -218,4 +216,4 @@ - <file>images/plugins/plugin_updater_updates.png</file> - <file>images/plugins/plugin_upgrade_valid.png</file> + <file>images/mimetypes/rtf.png</file> + <file>images/mimetypes/snb.png</file> + <file>images/mimetypes/svg.png</file> +@@ -220,4 +218,4 @@ + <file>images/window-close.png</file> + <file>images/wizard.png</file> </qresource> -</RCC> \ No newline at end of file @@ -62,10 +66,10 @@ index d5ecb06..b3e40d0 100644 \'/usr/include/ImageMagick', \] diff --git a/setup/extensions.json b/setup/extensions.json -index 1f6d1fb..1273904 100644 +index 6b97ea6..d9a9f68 100644 --- a/setup/extensions.json +++ b/setup/extensions.json -@@ -211,16 +211,5 @@ +@@ -199,16 +199,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" @@ -82,19 +86,6 @@ index 1f6d1fb..1273904 100644 - "windows_libraries": "User32 Advapi32 kernel32 Shell32" } ] -diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py -index 4d173b0..251c188 100644 ---- a/setup/installer/windows/freeze.py -+++ b/setup/installer/windows/freeze.py -@@ -674,7 +674,7 @@ class Win32Freeze(Command, WixMixIn): - # Because of https://github.com/fancycode/MemoryModule/issues/4 - # any extensions that use C++ exceptions must be loaded - # from files -- 'unrar.pyd', 'wpd.pyd', 'podofo.pyd', 'imageops.pyd', -+ 'wpd.pyd', 'podofo.pyd', 'imageops.pyd', - 'progress_indicator.pyd', 'hunspell.pyd', - # dupypy crashes when loaded from the zip file - 'dukpy.pyd', diff --git a/setup/resources.py b/setup/resources.py index 7fb34bd..3e5ef3b 100644 --- a/setup/resources.py @@ -109,7 +100,7 @@ index 7fb34bd..3e5ef3b 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 faa54dd..5b9fbee 100644 +index dbebce1..379bab0 100644 --- a/src/calibre/__init__.py +++ b/src/calibre/__init__.py @@ -292,10 +292,7 @@ def extract(path, dir): @@ -135,17 +126,21 @@ index faa54dd..5b9fbee 100644 raise Exception('Unknown archive type') extractor(path, dir) diff --git a/src/calibre/constants.py b/src/calibre/constants.py -index 673d2ef..64e4cc0 100644 +index 628fb93..4381b5b 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py -@@ -154,7 +154,6 @@ class Plugins(collections.Mapping): +@@ -158,9 +158,10 @@ class Plugins(collections.Mapping): 'zlib2', 'html', 'freetype', - 'unrar', 'imageops', 'qt_hack', - '_regex', ++ '_regex', ++ 'msgpack', + 'hunspell', + '_patiencediff_c', + 'bzzdec', diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 5efd33b..9d2027d 100644 --- a/src/calibre/customize/builtins.py @@ -213,7 +208,7 @@ index eaa97e7..ed37232 100644 diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py -index 531c1cd..880aa3b 100644 +index 8670797..75ce15a 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -78,7 +78,7 @@ class KOBO(USBMS): @@ -270,7 +265,7 @@ index f64acc5..2020bae 100644 core_usage = -1 diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py -index bf8853b..917c485 100644 +index 5cad968..c56e67b 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: @@ -383,7 +378,7 @@ index 08208c9..ff37b80 100644 spath = i.path mt = None diff --git a/src/calibre/gui2/actions/add.py b/src/calibre/gui2/actions/add.py -index c263495..8945075 100644 +index 2a00538..102df5b 100644 --- a/src/calibre/gui2/actions/add.py +++ b/src/calibre/gui2/actions/add.py @@ -36,8 +36,8 @@ def get_filters(): @@ -429,21 +424,8 @@ index 2aee3ce..a125939 100644 return tdir try: -diff --git a/src/calibre/library/server/opds.py b/src/calibre/library/server/opds.py -index 34157a0..718af59 100644 ---- a/src/calibre/library/server/opds.py -+++ b/src/calibre/library/server/opds.py -@@ -28,7 +28,7 @@ BASE_HREFS = { - 1 : '/opds', - } - --STANZA_FORMATS = frozenset(['epub', 'pdb', 'pdf', 'cbr', 'cbz', 'djvu']) -+STANZA_FORMATS = frozenset(['epub', 'pdb', 'pdf', 'cbz', 'djvu']) - - - def url_for(name, version, **kwargs): diff --git a/src/calibre/linux.py b/src/calibre/linux.py -index ebc8904..60036b3 100644 +index 0829417..78605e9 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -317,7 +317,7 @@ class ZshCompleter(object): # {{{ @@ -456,10 +438,10 @@ index ebc8904..60036b3 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 f11c08b..3176389 100644 +index 9d80091..5a06bb4 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py -@@ -168,10 +168,6 @@ class BuildTest(unittest.TestCase): +@@ -194,10 +194,6 @@ class BuildTest(unittest.TestCase): from calibre.gui2.win_file_dialogs import test test() @@ -471,10 +453,10 @@ index f11c08b..3176389 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 015b8f2..deded6d 100644 --- a/src/calibre/utils/search_query_parser.py +++ b/src/calibre/utils/search_query_parser.py -@@ -455,16 +455,16 @@ class Tester(SearchQueryParser): +@@ -453,16 +453,16 @@ class Tester(SearchQueryParser): u'Tor Books', u'lrf'], 8: [u'Stalky and Co.', u'Rudyard Kipling', u'manybooks.net', u'lrf'], @@ -496,7 +478,7 @@ index fe04af0..130fb81 100644 16: [u'Quicksilver', u'Neal Stephenson', None, u'lrf,zip'], 17: [u'The Comedies of William Shakespeare', u'William Shakespeare', -@@ -479,15 +479,15 @@ class Tester(SearchQueryParser): +@@ -477,15 +477,15 @@ class Tester(SearchQueryParser): None, u'lrf'], 20: [u'An Ideal Husband', u'Oscar Wilde', u'manybooks.net', u'lrf'], @@ -521,7 +503,7 @@ index fe04af0..130fb81 100644 30: [u'Genghis Khan and The Making of the Modern World', u'Jack Weatherford Orc', u'Three Rivers Press', -@@ -498,9 +498,9 @@ class Tester(SearchQueryParser): +@@ -496,9 +496,9 @@ class Tester(SearchQueryParser): u'lrf,zip'], 32: [u'The Killer Angels', u'Michael Shaara', None, u'html,lrf'], 33: [u'Band Of Brothers', u'Stephen E Ambrose', None, u'lrf,txt'], @@ -533,7 +515,7 @@ index fe04af0..130fb81 100644 37: [u'Masterman Ready', u'Marryat, Captain Frederick', None, u'lrf'], 38: [u'With the Lightnings', u'David Drake', -@@ -513,16 +513,16 @@ class Tester(SearchQueryParser): +@@ -511,16 +511,16 @@ class Tester(SearchQueryParser): 40: [u'The Far Side of The Stars', u'David Drake', u'Baen Publishing Enterprises', @@ -554,7 +536,7 @@ index fe04af0..130fb81 100644 44: [u'Harry Potter and the Order of the Phoenix', u'J. K. Rowling', None, -@@ -531,12 +531,12 @@ class Tester(SearchQueryParser): +@@ -529,12 +529,12 @@ class Tester(SearchQueryParser): 46: [u'The Stars at War II', u'Steve White', u'Baen Publishing Enterprises', @@ -570,7 +552,7 @@ index fe04af0..130fb81 100644 49: [u'Harry Potter and the Prisoner of Azkaban', u'J. K. Rowling', None, -@@ -549,20 +549,20 @@ class Tester(SearchQueryParser): +@@ -547,20 +547,20 @@ class Tester(SearchQueryParser): u'J.K. Rowling', None, u'lit,lrf,pdf'], @@ -596,7 +578,7 @@ index fe04af0..130fb81 100644 89: [u'Master and commander', u"Patrick O'Brian", u'Fontana,\n1971', -@@ -570,7 +570,7 @@ class Tester(SearchQueryParser): +@@ -568,7 +568,7 @@ class Tester(SearchQueryParser): 91: [u'A Companion to Wolves', u'Sarah Monette,Elizabeth Beär', None, @@ -605,7 +587,7 @@ index fe04af0..130fb81 100644 92: [u'The Lions of al-Rassan', u'Guy Gavriel Kay', u'Eos', u'lit,lrf'], 93: [u'Gardens of the Moon', u'Steven Erikson', u'Tor Fantasy', u'lit,lrf'], 95: [u'The Master and Margarita', -@@ -594,7 +594,7 @@ class Tester(SearchQueryParser): +@@ -592,7 +592,7 @@ class Tester(SearchQueryParser): 144: [u'Atonement', u'Ian McEwan', u'New York : Nan A. Talese/Doubleday, 2002.', @@ -614,7 +596,7 @@ index fe04af0..130fb81 100644 146: [u'1632', u'Eric Flint', u'Baen Books', u'lit,lrf'], 147: [u'1633', u'David Weber,Eric Flint,Dru Blair', u'Baen', u'lit,lrf'], 148: [u'1634: The Baltic War', -@@ -647,7 +647,7 @@ class Tester(SearchQueryParser): +@@ -645,7 +645,7 @@ class Tester(SearchQueryParser): 253: [u"Hunter's Run", u'George R. R. Martin,Gardner Dozois,Daniel Abraham', u'Eos', @@ -623,7 +605,7 @@ index fe04af0..130fb81 100644 257: [u'Knife of Dreams', u'Robert Jordan', None, u'lit,lrf'], 258: [u'Saturday', u'Ian McEwan', -@@ -667,7 +667,7 @@ class Tester(SearchQueryParser): +@@ -665,7 +665,7 @@ class Tester(SearchQueryParser): u'New York : Random House, 2005.', u'lit,lrf'], 269: [u'Reap the Whirlwind', u'David Mack', u'Star Trek', u'lit,lrf'], @@ -632,7 +614,7 @@ index fe04af0..130fb81 100644 273: [u'The Thousandfold Thought', u'R. Scott Bakker', u'Overlook TP', -@@ -675,17 +675,17 @@ class Tester(SearchQueryParser): +@@ -673,17 +673,17 @@ class Tester(SearchQueryParser): 276: [u'Elantris', u'Brandon Sanderson', u'New York : Tor, 2005.', @@ -654,7 +636,7 @@ index fe04af0..130fb81 100644 325: [u"Foundation's Triumph", u'David Brin', u'Easton Press', u'lit,lrf'], 327: [u'I am Charlotte Simmons', u'Tom Wolfe', u'Vintage', u'htm,lrf'], 335: [u'The Currents of Space', u'Isaac Asimov', None, u'lit,lrf'], -@@ -715,15 +715,15 @@ class Tester(SearchQueryParser): +@@ -713,15 +713,15 @@ class Tester(SearchQueryParser): u'Aspect', u'lit,lrf'], 356: [u'The Naked God', u'Peter F. Hamilton', u'Aspect', u'lit,lrf'], @@ -687,19 +669,28 @@ 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 e55dc61..837e492 100644 +index 50735db..b1be5c1 100644 --- a/translations/calibre/main.pot +++ b/translations/calibre/main.pot -@@ -4459,7 +4459,7 @@ msgid "Set book ID" +@@ -5190,7 +5190,7 @@ msgid "Set book ID" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:44 -msgid "Extract common e-book formats from archive files (ZIP/RAR). Also try to autodetect if they are actually CBZ/CBR files." -+msgid "Extract common e-book formats from archive files (ZIP). Also try to autodetect if they are actually CBZ/CBR files." ++msgid "Extract common e-book formats from archive files (ZIP). Also try to autodetect if they are actually CBZ files." + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:658 +@@ -7051,7 +7051,7 @@ msgid "Add books from directories, including sub-directories (Multiple books per + msgstr "" + + #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:67 +-msgid "Add multiple books from archive (ZIP/RAR)" ++msgid "Add multiple books from archive (ZIP)" msgstr "" - #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:655 -@@ -12903,7 +12903,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Inter + #: /home/kovid/work/calibre/src/calibre/gui2/actions/add.py:69 +@@ -13609,7 +13609,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Inter msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:36 |