diff options
Diffstat (limited to 'libre/calibre/libre.patch')
| -rw-r--r-- | libre/calibre/libre.patch | 61 |
1 files changed, 26 insertions, 35 deletions
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index 528922713..ca162e199 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -59,10 +59,10 @@ index 1622aab..7061d81 100644 \'/usr/include/ImageMagick', \] diff --git a/setup/extensions.py b/setup/extensions.py -index d309f5f..3611aaf 100644 +index d6a2dea..c8dea7a 100644 --- a/setup/extensions.py +++ b/setup/extensions.py -@@ -244,24 +244,6 @@ extensions = [ +@@ -240,24 +240,6 @@ extensions = [ sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] ), @@ -88,7 +88,7 @@ index d309f5f..3611aaf 100644 diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py -index b355b2f..cf4e16a 100644 +index 539ec35..f0537d9 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -674,7 +674,7 @@ class Win32Freeze(Command, WixMixIn): @@ -101,10 +101,10 @@ index b355b2f..cf4e16a 100644 # dupypy crashes when loaded from the zip file 'dukpy.pyd', diff --git a/setup/resources.py b/setup/resources.py -index b4ce05d..57cc14e 100644 +index df11ac2..29c7792 100644 --- a/setup/resources.py +++ b/setup/resources.py -@@ -321,7 +321,7 @@ class Resources(Command): # {{{ +@@ -324,7 +324,7 @@ class Resources(Command): # {{{ log = Log() # log.outputs = [] for inf in supported_input_formats(): @@ -140,7 +140,7 @@ index 4a62a5f..b52cca0 100644 raise Exception('Unknown archive type') extractor(path, dir) diff --git a/src/calibre/constants.py b/src/calibre/constants.py -index d91f0b7..97ea8cc 100644 +index 4244cbf..4dcb8e4 100644 --- a/src/calibre/constants.py +++ b/src/calibre/constants.py @@ -141,7 +141,6 @@ class Plugins(collections.Mapping): @@ -152,7 +152,7 @@ index d91f0b7..97ea8cc 100644 'qt_hack', '_regex', diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py -index 51184e3..5ac06cc 100644 +index 6392bdf..ea987d0 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -127,7 +127,7 @@ plugins += [HTML2ZIP, PML2PMLZ, TXT2TXTZ, ArchiveExtract,] @@ -204,10 +204,10 @@ index 51184e3..5ac06cc 100644 name = 'Read RB metadata' diff --git a/src/calibre/customize/ui.py b/src/calibre/customize/ui.py -index ad7f861..add33e6 100644 +index 81e80c0..412ea1a 100644 --- a/src/calibre/customize/ui.py +++ b/src/calibre/customize/ui.py -@@ -476,7 +476,7 @@ def available_input_formats(): +@@ -478,7 +478,7 @@ def available_input_formats(): if not is_disabled(plugin): for format in plugin.file_types: formats.add(format) @@ -217,7 +217,7 @@ index ad7f861..add33e6 100644 diff --git a/src/calibre/devices/kobo/driver.py b/src/calibre/devices/kobo/driver.py -index c20b9fb..c1b0a96 100644 +index 40f1fdf..6bd09e6 100644 --- a/src/calibre/devices/kobo/driver.py +++ b/src/calibre/devices/kobo/driver.py @@ -77,7 +77,7 @@ class KOBO(USBMS): @@ -274,7 +274,7 @@ index e3561bb..d1b5c79 100644 core_usage = -1 diff --git a/src/calibre/ebooks/conversion/plumber.py b/src/calibre/ebooks/conversion/plumber.py -index 0fd2d8f..5ad7f36 100644 +index 04ce4ec..a6c6827 100644 --- a/src/calibre/ebooks/conversion/plumber.py +++ b/src/calibre/ebooks/conversion/plumber.py @@ -42,7 +42,7 @@ various stages of conversion. The stages are: @@ -447,7 +447,7 @@ index 43cde64..63e4163 100644 def url_for(name, version, **kwargs): if not name.endswith('_'): diff --git a/src/calibre/linux.py b/src/calibre/linux.py -index 54d0e3b..5b7760e 100644 +index ea2463c..24c3698 100644 --- a/src/calibre/linux.py +++ b/src/calibre/linux.py @@ -312,7 +312,7 @@ class ZshCompleter(object): # {{{ @@ -460,29 +460,20 @@ index 54d0e3b..5b7760e 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 de3182b..05f17a3 100644 +index 1474f92..31251ed 100644 --- a/src/calibre/test_build.py +++ b/src/calibre/test_build.py -@@ -177,11 +177,6 @@ def test_file_dialog_helper(): - test() - print('File dialog helper OK!') - --def test_unrar(): -- from calibre.utils.unrar import test_basic -- test_basic() -- fprint('Unrar OK!') +@@ -166,10 +166,6 @@ class BuildTest(unittest.TestCase): + from calibre.gui2.win_file_dialogs import test + test() + +- def test_unrar(self): +- from calibre.utils.unrar import test_basic +- test_basic() - - def test_icu(): - fprint('Testing ICU') - from calibre.utils.icu_test import test_build -@@ -288,7 +283,6 @@ def test(): - test_sqlite() - test_apsw() - test_imaging() -- test_unrar() - test_certgen() - test_icu() - test_qt() + @unittest.skipUnless(iswindows, 'WPD is windows only') + 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 4c08706..15c1019 100644 --- a/src/calibre/utils/search_query_parser.py @@ -700,10 +691,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 9ced1a7..2fb35e1 100644 +index 64522dd..ccd968b 100644 --- a/translations/calibre/main.pot +++ b/translations/calibre/main.pot -@@ -4341,7 +4341,7 @@ msgid "Set book ID" +@@ -4405,7 +4405,7 @@ msgid "Set book ID" msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 @@ -712,7 +703,7 @@ index 9ced1a7..2fb35e1 100644 msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652 -@@ -12629,7 +12629,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Custo +@@ -12759,7 +12759,7 @@ msgid "You can also customise the plugin locations using <b>Preferences -> Custo msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 |