diff options
Diffstat (limited to 'libre/calibre/libre.patch')
| -rw-r--r-- | libre/calibre/libre.patch | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index 604551295..32d84b763 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -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.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 @@ +diff -Nur calibre-2.51.0.orig/setup/extensions.py calibre-2.51.0/setup/extensions.py +--- calibre-2.51.0.orig/setup/extensions.py 2016-02-12 00:59:23.000000000 -0300 ++++ calibre-2.51.0/setup/extensions.py 2016-02-23 17:55:30.300022628 -0300 +@@ -247,24 +247,6 @@ sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] ), @@ -95,10 +95,10 @@ diff -Nur calibre-2.48.0.orig/setup/installer/windows/freeze.py calibre-2.48.0/s 'progress_indicator.pyd', 'hunspell.pyd', # As per this https://bugs.launchpad.net/bugs/1087816 # on some systems magick.pyd fails to load from memory -diff -Nur calibre-2.34.0.orig/setup/resources.py calibre-2.34.0/setup/resources.py ---- calibre-2.34.0.orig/setup/resources.py 2015-08-07 01:09:19.000000000 -0300 -+++ calibre-2.34.0/setup/resources.py 2015-08-11 16:40:39.532800843 -0300 -@@ -285,7 +285,7 @@ +diff -Nur calibre-2.51.0.orig/setup/resources.py calibre-2.51.0/setup/resources.py +--- calibre-2.51.0.orig/setup/resources.py 2016-02-12 00:59:23.000000000 -0300 ++++ calibre-2.51.0/setup/resources.py 2016-02-23 17:55:30.300022628 -0300 +@@ -312,7 +312,7 @@ log = Log() # log.outputs = [] for inf in supported_input_formats(): @@ -438,9 +438,9 @@ 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.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 +diff -Nur calibre-2.51.0.orig/src/calibre/test_build.py calibre-2.51.0/src/calibre/test_build.py +--- calibre-2.51.0.orig/src/calibre/test_build.py 2016-02-12 00:59:23.000000000 -0300 ++++ calibre-2.51.0/src/calibre/test_build.py 2016-02-23 17:56:03.978397336 -0300 @@ -168,11 +168,6 @@ raise RuntimeError('PIL choked!') fprint('PIL OK!') @@ -450,10 +450,10 @@ diff -Nur calibre-2.48.0.orig/src/calibre/test_build.py calibre-2.48.0/src/calib - test_basic() - fprint('Unrar OK!') - - def test_ssl(): - import ssl - ssl -@@ -283,7 +278,6 @@ + def test_icu(): + fprint('Testing ICU') + from calibre.utils.icu_test import test_build +@@ -287,7 +282,6 @@ test_sqlite() test_apsw() test_imaging() @@ -675,10 +675,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.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 @@ +diff -Nur calibre-2.51.0.orig/translations/calibre/main.pot calibre-2.51.0/translations/calibre/main.pot +--- calibre-2.51.0.orig/translations/calibre/main.pot 2016-02-12 01:18:39.000000000 -0300 ++++ calibre-2.51.0/translations/calibre/main.pot 2016-02-23 17:55:30.310022144 -0300 +@@ -4109,7 +4109,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 @@ -687,7 +687,7 @@ diff -Nur calibre-2.48.0.orig/translations/calibre/main.pot calibre-2.48.0/trans msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652 -@@ -12082,7 +12082,7 @@ +@@ -12069,7 +12069,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 |