From c6394b6e254823ea7ce8796695db76d892915f2f Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Sat, 4 Oct 2014 19:40:31 -0300 Subject: calibre-2.5.0-1.parabola1: updating version --- libre/calibre/libre.patch | 89 ++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 43 deletions(-) (limited to 'libre/calibre/libre.patch') diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index 7f1bdb6ee..449864c17 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -1,18 +1,21 @@ -diff -Nur calibre-1.204.1.orig/resources/images.qrc calibre-1.204.1/resources/images.qrc ---- calibre-1.204.1.orig/resources/images.qrc 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/resources/images.qrc 2014-08-03 19:38:32.047600280 -0300 -@@ -193,8 +193,6 @@ +diff -Nur calibre-2.5.0.orig/resources/images.qrc calibre-2.5.0/resources/images.qrc +--- calibre-2.5.0.orig/resources/images.qrc 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-2.5.0/resources/images.qrc 2014-10-04 19:24:44.275781452 -0300 +@@ -179,11 +179,9 @@ + images/mimetypes/html.png + images/mimetypes/xps.png images/mimetypes/svg.png - images/mimetypes/odt.png - images/mimetypes/epub.png -images/mimetypes/cbr.png --images/mimetypes/rar.png images/mimetypes/tpz.png - images/mimetypes/djvu.png - images/mimetypes/computer.png + images/mimetypes/snb.png + images/mimetypes/png.png +-images/mimetypes/rar.png + images/mimetypes/mobi.png + images/mimetypes/gif.png + images/mimetypes/pdf.png @@ -214,4 +212,4 @@ - images/mimetypes/html.png - images/mimetypes/lrx.png + images/plugins/plugin_updater_updates.png + images/plugins/plugin_upgrade_valid.png - \ No newline at end of file @@ -55,10 +58,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-1.204.1.orig/setup/extensions.py calibre-1.204.1/setup/extensions.py ---- calibre-1.204.1.orig/setup/extensions.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/setup/extensions.py 2014-08-03 19:37:20.290255565 -0300 -@@ -229,24 +229,6 @@ +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 @@ sip_files=['calibre/ebooks/pdf/render/qt_hack.sip'] ), @@ -95,10 +98,10 @@ diff -Nur calibre-1.204.1.orig/setup/installer/windows/freeze.py calibre-1.204.1 '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-1.204.1.orig/setup/resources.py calibre-1.204.1/setup/resources.py ---- calibre-1.204.1.orig/setup/resources.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/setup/resources.py 2014-08-03 19:37:20.290255565 -0300 -@@ -280,7 +280,7 @@ +diff -Nur calibre-2.5.0.orig/setup/resources.py calibre-2.5.0/setup/resources.py +--- calibre-2.5.0.orig/setup/resources.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-2.5.0/setup/resources.py 2014-10-04 19:23:44.118602581 -0300 +@@ -285,7 +285,7 @@ log = Log() # log.outputs = [] for inf in supported_input_formats(): @@ -233,10 +236,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/devices/mtp/filesystem_cache.py calib class FileOrFolder(object): -diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/__init__.py calibre-1.204.1/src/calibre/ebooks/__init__.py ---- calibre-1.204.1.orig/src/calibre/ebooks/__init__.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/ebooks/__init__.py 2014-08-03 19:37:20.290255565 -0300 -@@ -26,9 +26,9 @@ +diff -Nur calibre-2.5.0.orig/src/calibre/ebooks/__init__.py calibre-2.5.0/src/calibre/ebooks/__init__.py +--- calibre-2.5.0.orig/src/calibre/ebooks/__init__.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-2.5.0/src/calibre/ebooks/__init__.py 2014-10-04 19:23:44.121935941 -0300 +@@ -25,9 +25,9 @@ class ParserError(ValueError): pass @@ -419,10 +422,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/gui2/actions/add.py calibre-1.204.1/s if paths: self.do_add_recursive(paths[0], single) -diff -Nur calibre-1.204.1.orig/src/calibre/gui2/add.py calibre-1.204.1/src/calibre/gui2/add.py ---- calibre-1.204.1.orig/src/calibre/gui2/add.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/gui2/add.py 2014-08-03 19:37:20.293588940 -0300 -@@ -84,11 +84,8 @@ +diff -Nur calibre-2.5.0.orig/src/calibre/gui2/add.py calibre-2.5.0/src/calibre/gui2/add.py +--- calibre-2.5.0.orig/src/calibre/gui2/add.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-2.5.0/src/calibre/gui2/add.py 2014-10-04 19:23:44.121935941 -0300 +@@ -85,11 +85,8 @@ prints('Corrupt ZIP file, trying to use local headers') from calibre.utils.localunzip import extractall extractall(self.path, self.tdir) @@ -435,7 +438,7 @@ diff -Nur calibre-1.204.1.orig/src/calibre/gui2/add.py calibre-1.204.1/src/calib def run(self): if self.tdir is not None: -@@ -292,7 +289,7 @@ +@@ -296,7 +293,7 @@ self.pd.canceled_signal.connect(self.canceled) def add_recursive(self, root, single=True): @@ -456,10 +459,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/library/server/opds.py calibre-1.204. def url_for(name, version, **kwargs): if not name.endswith('_'): -diff -Nur calibre-1.204.1.orig/src/calibre/linux.py calibre-1.204.1/src/calibre/linux.py ---- calibre-1.204.1.orig/src/calibre/linux.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/linux.py 2014-08-03 19:37:20.293588940 -0300 -@@ -316,7 +316,7 @@ +diff -Nur calibre-2.5.0.orig/src/calibre/linux.py calibre-2.5.0/src/calibre/linux.py +--- calibre-2.5.0.orig/src/calibre/linux.py 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-2.5.0/src/calibre/linux.py 2014-10-04 19:23:44.121935941 -0300 +@@ -312,7 +312,7 @@ ): for fmt in fmts: is_input = group_title == input_group @@ -468,10 +471,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/linux.py calibre-1.204.1/src/calibre/ continue p = (get_parser(input_fmt=fmt) if is_input else get_parser(output_fmt=fmt)) -diff -Nur calibre-1.204.1.orig/src/calibre/test_build.py calibre-1.204.1/src/calibre/test_build.py ---- calibre-1.204.1.orig/src/calibre/test_build.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/test_build.py 2014-08-03 19:37:20.293588940 -0300 -@@ -139,11 +139,6 @@ +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 @@ raise RuntimeError('PIL choked!') print ('PIL OK!') @@ -483,7 +486,7 @@ diff -Nur calibre-1.204.1.orig/src/calibre/test_build.py calibre-1.204.1/src/cal def test_ssl(): import ssl ssl -@@ -217,7 +212,6 @@ +@@ -222,7 +217,6 @@ test_sqlite() test_apsw() test_imaging() @@ -705,10 +708,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-1.204.1.orig/translations/calibre/main.pot calibre-1.204.1/translations/calibre/main.pot ---- calibre-1.204.1.orig/translations/calibre/main.pot 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/translations/calibre/main.pot 2014-08-03 19:37:20.296922310 -0300 -@@ -3906,7 +3906,7 @@ +diff -Nur calibre-2.5.0.orig/translations/calibre/main.pot calibre-2.5.0/translations/calibre/main.pot +--- calibre-2.5.0.orig/translations/calibre/main.pot 1989-12-31 22:00:00.000000000 -0200 ++++ calibre-2.5.0/translations/calibre/main.pot 2014-10-04 19:23:44.131936026 -0300 +@@ -4028,7 +4028,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 @@ -716,8 +719,8 @@ diff -Nur calibre-1.204.1.orig/translations/calibre/main.pot calibre-1.204.1/tra +msgid "Extract common e-book formats from archives (zip) files. Also try to autodetect if they are actually cbz files." msgstr "" - #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:644 -@@ -11087,7 +11087,7 @@ + #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652 +@@ -11554,7 +11554,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 -- cgit v1.2.3