diff options
Diffstat (limited to 'libre/calibre/libre.patch')
| -rw-r--r-- | libre/calibre/libre.patch | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index b1465a464..3c133b7b2 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -1,7 +1,7 @@ -diff -Nur calibre-2.45.0.orig/resources/images.qrc calibre-2.45.0/resources/images.qrc ---- calibre-2.45.0.orig/resources/images.qrc 2015-10-26 15:40:08.000000000 -0300 -+++ calibre-2.45.0/resources/images.qrc 2015-11-27 13:00:44.758902890 -0300 -@@ -196,8 +196,6 @@ +diff -Nur calibre-2.48.0.orig/resources/images.qrc calibre-2.48.0/resources/images.qrc +--- calibre-2.48.0.orig/resources/images.qrc 2015-11-28 10:04:07.000000000 -0300 ++++ calibre-2.48.0/resources/images.qrc 2016-01-01 17:56:54.010720465 -0300 +@@ -197,8 +197,6 @@ <file>images/mimetypes/svg.png</file> <file>images/mimetypes/odt.png</file> <file>images/mimetypes/epub.png</file> @@ -10,7 +10,7 @@ diff -Nur calibre-2.45.0.orig/resources/images.qrc calibre-2.45.0/resources/imag <file>images/mimetypes/tpz.png</file> <file>images/mimetypes/djvu.png</file> <file>images/mimetypes/computer.png</file> -@@ -217,4 +215,4 @@ +@@ -218,4 +216,4 @@ <file>images/mimetypes/html.png</file> <file>images/mimetypes/lrx.png</file> </qresource> @@ -55,10 +55,10 @@ diff -Nur calibre-2.34.0.orig/session.vim calibre-2.34.0/session.vim \'src/qt-harfbuzz/src', \'/usr/include/ImageMagick', \] -diff -Nur calibre-2.45.0.orig/setup/extensions.py calibre-2.45.0/setup/extensions.py ---- calibre-2.45.0.orig/setup/extensions.py 2015-11-27 00:22:13.000000000 -0300 -+++ calibre-2.45.0/setup/extensions.py 2015-11-27 13:00:44.758902890 -0300 -@@ -249,24 +249,6 @@ +diff -Nur calibre-2.48.0.orig/setup/extensions.py calibre-2.48.0/setup/extensions.py +--- calibre-2.48.0.orig/setup/extensions.py 2016-01-01 01:13:45.000000000 -0300 ++++ calibre-2.48.0/setup/extensions.py 2016-01-01 17:56:54.014053634 -0300 +@@ -250,24 +250,6 @@ sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] ), @@ -83,10 +83,10 @@ diff -Nur calibre-2.45.0.orig/setup/extensions.py calibre-2.45.0/setup/extension ] -diff -Nur calibre-2.34.0.orig/setup/installer/windows/freeze.py calibre-2.34.0/setup/installer/windows/freeze.py ---- calibre-2.34.0.orig/setup/installer/windows/freeze.py 2015-08-07 01:09:19.000000000 -0300 -+++ calibre-2.34.0/setup/installer/windows/freeze.py 2015-08-11 16:40:39.532800843 -0300 -@@ -672,7 +672,7 @@ +diff -Nur calibre-2.48.0.orig/setup/installer/windows/freeze.py calibre-2.48.0/setup/installer/windows/freeze.py +--- calibre-2.48.0.orig/setup/installer/windows/freeze.py 2016-01-01 01:13:45.000000000 -0300 ++++ calibre-2.48.0/setup/installer/windows/freeze.py 2016-01-01 17:56:54.014053634 -0300 +@@ -683,7 +683,7 @@ # Because of https://github.com/fancycode/MemoryModule/issues/4 # any extensions that use C++ exceptions must be loaded # from files @@ -441,22 +441,22 @@ diff -Nur calibre-2.34.0.orig/src/calibre/linux.py calibre-2.34.0/src/calibre/li continue p = (get_parser(input_fmt=fmt) if is_input else get_parser(output_fmt=fmt)) -diff -Nur calibre-2.45.0.orig/src/calibre/test_build.py calibre-2.45.0/src/calibre/test_build.py ---- calibre-2.45.0.orig/src/calibre/test_build.py 2015-11-27 00:22:13.000000000 -0300 -+++ calibre-2.45.0/src/calibre/test_build.py 2015-11-27 13:00:44.762236057 -0300 -@@ -162,11 +162,6 @@ +diff -Nur calibre-2.48.0.orig/src/calibre/test_build.py calibre-2.48.0/src/calibre/test_build.py +--- calibre-2.48.0.orig/src/calibre/test_build.py 2016-01-01 01:13:45.000000000 -0300 ++++ calibre-2.48.0/src/calibre/test_build.py 2016-01-01 17:57:32.398831830 -0300 +@@ -168,11 +168,6 @@ raise RuntimeError('PIL choked!') - print ('PIL OK!') + fprint('PIL OK!') -def test_unrar(): - from calibre.utils.unrar import test_basic - test_basic() -- print ('Unrar OK!') +- fprint('Unrar OK!') - def test_ssl(): import ssl ssl -@@ -251,7 +246,6 @@ +@@ -283,7 +278,6 @@ test_sqlite() test_apsw() test_imaging() @@ -678,10 +678,10 @@ diff -Nur calibre-2.34.0.orig/src/calibre/web/feeds/feedparser.py calibre-2.34.0 def __init__(self, data, baseuri, encoding): self.document = BeautifulSoup.BeautifulSoup(data) -diff -Nur calibre-2.45.0.orig/translations/calibre/main.pot calibre-2.45.0/translations/calibre/main.pot ---- calibre-2.45.0.orig/translations/calibre/main.pot 2015-11-27 00:29:42.000000000 -0300 -+++ calibre-2.45.0/translations/calibre/main.pot 2015-11-27 13:00:44.768902392 -0300 -@@ -4148,7 +4148,7 @@ +diff -Nur calibre-2.48.0.orig/translations/calibre/main.pot calibre-2.48.0/translations/calibre/main.pot +--- calibre-2.48.0.orig/translations/calibre/main.pot 2016-01-01 00:58:28.000000000 -0300 ++++ calibre-2.48.0/translations/calibre/main.pot 2016-01-01 17:56:54.044052158 -0300 +@@ -4122,7 +4122,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 @@ -690,7 +690,7 @@ diff -Nur calibre-2.45.0.orig/translations/calibre/main.pot calibre-2.45.0/trans msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652 -@@ -12030,7 +12030,7 @@ +@@ -12082,7 +12082,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 |