diff options
| -rw-r--r-- | libre/calibre/PKGBUILD | 10 | ||||
| -rw-r--r-- | libre/calibre/libre.patch | 94 |
2 files changed, 46 insertions, 58 deletions
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD index 9d467ef71..a4860af49 100644 --- a/libre/calibre/PKGBUILD +++ b/libre/calibre/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 122158 2014-11-07 12:54:59Z jelle $ +# $Id: PKGBUILD 122571 2014-11-14 15:28:57Z jelle $ # Maintainer (Arch): Jelle van der Waa <jelle@vdwaa.nl> # Maintainer (Arch): Daniel Wallace <danielwallace at gtmanfred dot com> # Contributor (Arch): Giovanni Scafora <giovanni@archlinux.org> @@ -9,7 +9,7 @@ pkgname=calibre _pkgname=$pkgname-libre -pkgver=2.9.0 +pkgver=2.10.0 pkgrel=1.parabola1 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives" arch=('i686' 'x86_64' 'mips64el') @@ -32,9 +32,9 @@ install=$pkgname.install mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz") source=("https://repo.parabolagnulinux.org/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz" 'libre.patch') -mkmd5sums=('06675c778a3f28f06ce982e86cb7aa80') -md5sums=('064f9185f6cea73315c48bd6296a08d2' - 'ca0d5aec7495a0709be2d42f49067247') +mkmd5sums=('fbd743048d83ac41b22b6b75ea230c01') +md5sums=('a5603fa9135e48f28024311bf957d5c1' + '7e964e5c88affc299b69e8c2744a4393') mksource(){ cd "${srcdir}/${pkgname}-${pkgver}" diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch index 1c84d029a..45a717a4e 100644 --- a/libre/calibre/libre.patch +++ b/libre/calibre/libre.patch @@ -197,10 +197,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/customize/builtins.py calibre-1.204.1 class RBMetadataReader(MetadataReaderPlugin): name = 'Read RB metadata' -diff -Nur calibre-1.204.1.orig/src/calibre/customize/ui.py calibre-1.204.1/src/calibre/customize/ui.py ---- calibre-1.204.1.orig/src/calibre/customize/ui.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/customize/ui.py 2014-08-03 19:37:20.290255565 -0300 -@@ -440,7 +440,7 @@ +diff -Nur calibre-2.10.0.orig/src/calibre/customize/ui.py calibre-2.10.0/src/calibre/customize/ui.py +--- calibre-2.10.0.orig/src/calibre/customize/ui.py 2014-11-14 01:22:49.000000000 -0200 ++++ calibre-2.10.0/src/calibre/customize/ui.py 2014-11-14 20:25:07.477764064 -0200 +@@ -447,7 +447,7 @@ if not is_disabled(plugin): for format in plugin.file_types: formats.add(format) @@ -356,22 +356,22 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1. if comment: import json -diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-1.204.1/src/calibre/ebooks/oeb/iterator/book.py ---- calibre-1.204.1.orig/src/calibre/ebooks/oeb/iterator/book.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/ebooks/oeb/iterator/book.py 2014-08-03 19:37:20.290255565 -0300 -@@ -126,7 +126,7 @@ +diff -Nur calibre-2.10.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.10.0/src/calibre/ebooks/oeb/iterator/book.py +--- calibre-2.10.0.orig/src/calibre/ebooks/oeb/iterator/book.py 2014-11-14 01:22:49.000000000 -0200 ++++ calibre-2.10.0/src/calibre/ebooks/oeb/iterator/book.py 2014-11-14 20:25:07.481097421 -0200 +@@ -127,7 +127,7 @@ self.spine = [] - Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, + Spiny = partial(SpineItem, read_anchor_map=read_anchor_map, read_links=read_links, run_char_count=run_char_count, from_epub=self.book_format == 'EPUB') - is_comic = plumber.input_fmt.lower() in {'cbc', 'cbz', 'cbr', 'cb7'} + is_comic = plumber.input_fmt.lower() in {'cbc', 'cbz', 'cb7'} for i in ordered: spath = i.path mt = None -diff -Nur calibre-2.7.0.orig/src/calibre/gui2/__init__.py calibre-2.7.0/src/calibre/gui2/__init__.py ---- calibre-2.7.0.orig/src/calibre/gui2/__init__.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-2.7.0/src/calibre/gui2/__init__.py 2014-10-24 15:03:21.457620008 -0200 -@@ -499,7 +499,6 @@ +diff -Nur calibre-2.10.0.orig/src/calibre/gui2/__init__.py calibre-2.10.0/src/calibre/gui2/__init__.py +--- calibre-2.10.0.orig/src/calibre/gui2/__init__.py 2014-11-14 01:22:49.000000000 -0200 ++++ calibre-2.10.0/src/calibre/gui2/__init__.py 2014-11-14 20:25:07.481097421 -0200 +@@ -505,7 +505,6 @@ 'png' : 'png', 'bmp' : 'bmp', 'cbz' : 'cbz', @@ -379,7 +379,7 @@ diff -Nur calibre-2.7.0.orig/src/calibre/gui2/__init__.py calibre-2.7.0/src/cali 'svg' : 'svg', 'html' : 'html', 'htmlz' : 'html', -@@ -511,7 +510,6 @@ +@@ -517,7 +516,6 @@ 'lrx' : 'lrx', 'pdf' : 'pdf', 'pdr' : 'zero', @@ -387,10 +387,10 @@ diff -Nur calibre-2.7.0.orig/src/calibre/gui2/__init__.py calibre-2.7.0/src/cali 'zip' : 'zip', 'txt' : 'txt', 'text' : 'txt', -diff -Nur calibre-1.204.1.orig/src/calibre/gui2/actions/add.py calibre-1.204.1/src/calibre/gui2/actions/add.py ---- calibre-1.204.1.orig/src/calibre/gui2/actions/add.py 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-1.204.1/src/calibre/gui2/actions/add.py 2014-08-03 19:37:20.293588940 -0300 -@@ -39,8 +39,8 @@ +diff -Nur calibre-2.10.0.orig/src/calibre/gui2/actions/add.py calibre-2.10.0/src/calibre/gui2/actions/add.py +--- calibre-2.10.0.orig/src/calibre/gui2/actions/add.py 2014-11-14 01:22:49.000000000 -0200 ++++ calibre-2.10.0/src/calibre/gui2/actions/add.py 2014-11-14 20:33:11.307849536 -0200 +@@ -38,8 +38,8 @@ (_('Text books'), ['txt', 'text', 'rtf']), (_('PDF Books'), ['pdf', 'azw4']), (_('SNB Books'), ['snb']), @@ -401,7 +401,7 @@ diff -Nur calibre-1.204.1.orig/src/calibre/gui2/actions/add.py calibre-1.204.1/s (_('Wordprocessor files'), ['odt', 'doc', 'docx']), ] -@@ -67,7 +67,7 @@ +@@ -66,7 +66,7 @@ 'sub directories (Multiple books per directory, assumes every ' 'ebook file is a different book)')).triggered.connect( self.add_recursive_multiple) @@ -414,36 +414,24 @@ diff -Nur calibre-1.204.1.orig/src/calibre/gui2/actions/add.py calibre-1.204.1/s def add_archive(self, single): paths = choose_files( self.gui, 'recursive-archive-add', _('Choose archive file'), -- filters=[(_('Archives'), ('zip', 'rar'))], all_files=False, select_only_single_file=True) -+ filters=[(_('Archives'), ('zip'))], all_files=False, select_only_single_file=True) +- filters=[(_('Archives'), ('zip', 'rar'))], all_files=False, select_only_single_file=False) ++ filters=[(_('Archives'), ('zip'))], all_files=False, select_only_single_file=False) if paths: - self.do_add_recursive(paths[0], single) - -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) -- elif self.path.lower().endswith('.rar'): -- from calibre.utils.unrar import extract -- extract(self.path, self.tdir) - else: -- raise ValueError('Can only process ZIP or RAR archives') -+ raise ValueError('Can only process ZIP archives') - - def run(self): - if self.tdir is not None: -@@ -296,7 +293,7 @@ - self.pd.canceled_signal.connect(self.canceled) - - def add_recursive(self, root, single=True): -- if os.path.exists(root) and os.path.isfile(root) and root.lower().rpartition('.')[-1] in {'zip', 'rar'}: -+ if os.path.exists(root) and os.path.isfile(root) and root.lower().rpartition('.')[-1] in {'zip'}: - self.path = tdir = PersistentTemporaryDirectory('_arcv_') - else: - self.path = root + self.do_add_recursive(paths, single, list_of_archives=True) + +diff -Nur calibre-2.10.0.orig/src/calibre/gui2/add.py calibre-2.10.0/src/calibre/gui2/add.py +--- calibre-2.10.0.orig/src/calibre/gui2/add.py 2014-11-14 01:22:49.000000000 -0200 ++++ calibre-2.10.0/src/calibre/gui2/add.py 2014-11-14 20:30:34.303402987 -0200 +@@ -137,9 +137,6 @@ + prints('Corrupt ZIP file, trying to use local headers') + from calibre.utils.localunzip import extractall + extractall(source, tdir) +- elif source.lower().endswith('.rar'): +- from calibre.utils.unrar import extract +- extract(source, tdir) + return tdir + + try: diff -Nur calibre-1.204.1.orig/src/calibre/library/server/opds.py calibre-1.204.1/src/calibre/library/server/opds.py --- calibre-1.204.1.orig/src/calibre/library/server/opds.py 1989-12-31 22:00:00.000000000 -0200 +++ calibre-1.204.1/src/calibre/library/server/opds.py 2014-08-03 19:37:20.293588940 -0300 @@ -705,10 +693,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.7.0.orig/translations/calibre/main.pot calibre-2.7.0/translations/calibre/main.pot ---- calibre-2.7.0.orig/translations/calibre/main.pot 1989-12-31 22:00:00.000000000 -0200 -+++ calibre-2.7.0/translations/calibre/main.pot 2014-10-24 15:03:21.464286712 -0200 -@@ -4032,7 +4032,7 @@ +diff -Nur calibre-2.10.0.orig/translations/calibre/main.pot calibre-2.10.0/translations/calibre/main.pot +--- calibre-2.10.0.orig/translations/calibre/main.pot 2014-11-14 01:25:17.000000000 -0200 ++++ calibre-2.10.0/translations/calibre/main.pot 2014-11-14 20:25:07.487764134 -0200 +@@ -4045,7 +4045,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42 @@ -717,7 +705,7 @@ diff -Nur calibre-2.7.0.orig/translations/calibre/main.pot calibre-2.7.0/transla msgstr "" #: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652 -@@ -11573,7 +11573,7 @@ +@@ -11554,7 +11554,7 @@ msgstr "" #: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33 |