diff options
Diffstat (limited to 'libre/calibre/libre.patch')
| -rw-r--r-- | libre/calibre/libre.patch | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index 11fb33f1f..22994f434 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -17,10 +17,10 @@ diff -Nur calibre-2.27.0.orig/resources/images.qrc calibre-2.27.0/resources/imag -</RCC> \ No newline at end of file +</RCC> -diff -Nur calibre-2.27.0.orig/resources/mime.types calibre-2.27.0/resources/mime.types ---- calibre-2.27.0.orig/resources/mime.types 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-2.27.0/resources/mime.types 2015-05-04 23:50:46.566711080 -0300 -@@ -137,7 +137,6 @@ +diff -Nur calibre-2.29.0.orig/resources/mime.types calibre-2.29.0/resources/mime.types +--- calibre-2.29.0.orig/resources/mime.types 2015-05-28 23:46:06.000000000 -0300 ++++ calibre-2.29.0/resources/mime.types 2015-05-30 04:50:23.795523059 -0300 +@@ -138,7 +138,6 @@ application/prs.nprend application/prs.plucker application/qsig @@ -55,10 +55,10 @@ diff -Nur calibre-1.204.1.orig/session.vim calibre-1.204.1/session.vim \'src/qt-harfbuzz/src', \'/usr/include/ImageMagick', \] -diff -Nur calibre-2.5.0.orig/setup/extensions.py calibre-2.5.0/setup/extensions.py ---- calibre-2.5.0.orig/setup/extensions.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-2.5.0/setup/extensions.py 2014-10-04 19:23:44.118602581 -0300 -@@ -230,24 +230,6 @@ +diff -Nur calibre-2.29.0.orig/setup/extensions.py calibre-2.29.0/setup/extensions.py +--- calibre-2.29.0.orig/setup/extensions.py 2015-05-28 23:46:06.000000000 -0300 ++++ calibre-2.29.0/setup/extensions.py 2015-05-30 04:50:23.795523059 -0300 +@@ -240,24 +240,6 @@ sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] ), @@ -107,10 +107,10 @@ diff -Nur calibre-2.5.0.orig/setup/resources.py calibre-2.5.0/setup/resources.py continue for ouf in available_output_formats(): of = ouf if ouf == 'oeb' else 'dummy.'+ouf -diff -Nur calibre-2.27.0.orig/src/calibre/__init__.py calibre-2.27.0/src/calibre/__init__.py ---- calibre-2.27.0.orig/src/calibre/__init__.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-2.27.0/src/calibre/__init__.py 2015-05-04 23:50:46.570044248 -0300 -@@ -272,10 +272,7 @@ +diff -Nur calibre-2.29.0.orig/src/calibre/__init__.py calibre-2.29.0/src/calibre/__init__.py +--- calibre-2.29.0.orig/src/calibre/__init__.py 2015-05-28 23:46:06.000000000 -0300 ++++ calibre-2.29.0/src/calibre/__init__.py 2015-05-30 04:50:23.795523059 -0300 +@@ -264,10 +264,7 @@ # First use the file header to identify its type with open(path, 'rb') as f: id_ = f.read(3) @@ -122,7 +122,7 @@ diff -Nur calibre-2.27.0.orig/src/calibre/__init__.py calibre-2.27.0/src/calibre from calibre.libunzip import extract as zipextract extractor = zipextract if extractor is None: -@@ -284,9 +281,6 @@ +@@ -276,9 +273,6 @@ if ext in ['zip', 'cbz', 'epub', 'oebzip']: from calibre.libunzip import extract as zipextract extractor = zipextract @@ -460,10 +460,10 @@ diff -Nur calibre-2.5.0.orig/src/calibre/linux.py calibre-2.5.0/src/calibre/linu continue p = (get_parser(input_fmt=fmt) if is_input else get_parser(output_fmt=fmt)) -diff -Nur calibre-2.5.0.orig/src/calibre/test_build.py calibre-2.5.0/src/calibre/test_build.py ---- calibre-2.5.0.orig/src/calibre/test_build.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-2.5.0/src/calibre/test_build.py 2014-10-04 19:23:44.125269302 -0300 -@@ -143,11 +143,6 @@ +diff -Nur calibre-2.29.0.orig/src/calibre/test_build.py calibre-2.29.0/src/calibre/test_build.py +--- calibre-2.29.0.orig/src/calibre/test_build.py 2015-05-28 23:46:06.000000000 -0300 ++++ calibre-2.29.0/src/calibre/test_build.py 2015-05-30 04:51:26.842374333 -0300 +@@ -147,11 +147,6 @@ raise RuntimeError('PIL choked!') print ('PIL OK!') @@ -475,14 +475,14 @@ diff -Nur calibre-2.5.0.orig/src/calibre/test_build.py calibre-2.5.0/src/calibre def test_ssl(): import ssl ssl -@@ -222,7 +217,6 @@ +@@ -226,7 +221,6 @@ test_sqlite() test_apsw() test_imaging() - test_unrar() + test_certgen() test_icu() test_woff() - test_qt() diff -Nur calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py calibre-1.204.1/src/calibre/utils/search_query_parser.py --- calibre-1.204.1.orig/src/calibre/utils/search_query_parser.py 1989-12-31 22:00:00.000000000 -0200 +++ calibre-1.204.1/src/calibre/utils/search_query_parser.py 2014-08-03 19:37:20.296922310 -0300 @@ -697,10 +697,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/web/feeds/feedparser.py calibre-1.204 def __init__(self, data, baseuri, encoding): self.document = BeautifulSoup.BeautifulSoup(data) -diff -Nur calibre-2.27.0.orig/translations/calibre/main.pot calibre-2.27.0/translations/calibre/main.pot ---- calibre-2.27.0.orig/translations/calibre/main.pot 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-2.27.0/translations/calibre/main.pot 2015-05-04 23:50:46.580043748 -0300 -@@ -4077,7 +4077,7 @@ +diff -Nur calibre-2.29.0.orig/translations/calibre/main.pot calibre-2.29.0/translations/calibre/main.pot +--- calibre-2.29.0.orig/translations/calibre/main.pot 2015-05-28 23:47:51.000000000 -0300 ++++ calibre-2.29.0/translations/calibre/main.pot 2015-05-30 04:50:23.805522558 -0300 +@@ -4111,7 +4111,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 @@ -709,7 +709,7 @@ diff -Nur calibre-2.27.0.orig/translations/calibre/main.pot calibre-2.27.0/trans msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652 -@@ -11820,7 +11820,7 @@ +@@ -11841,7 +11841,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 |