summaryrefslogtreecommitdiff
path: root/libre/calibre
diff options
context:
space:
mode:
Diffstat (limited to 'libre/calibre')
-rw-r--r--libre/calibre/PKGBUILD10
-rw-r--r--libre/calibre/libre.patch88
2 files changed, 51 insertions, 47 deletions
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 897d08c26..83b760053 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 132107 2015-04-24 12:23:45Z jelle $
+# $Id: PKGBUILD 132635 2015-05-02 09:40:48Z 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.26.0
+pkgver=2.27.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.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.xz"
'libre.patch')
-mkmd5sums=('1debc20780bde39e90adf2e710f7ecfc')
-md5sums=('00a40896cd104b99b332022f9ffffc71'
- '7e964e5c88affc299b69e8c2744a4393')
+mkmd5sums=('a41aa53d514b095fc269cefa69bf88e5')
+md5sums=('4bcef173cc7775bc82c0d5e17c78f5eb'
+ '466d44b66e40a94ede272093ccd9ade4')
mksource(){
cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 45a717a4e..11fb33f1f 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -1,7 +1,7 @@
-diff -Nur calibre-2.7.0.orig/resources/images.qrc calibre-2.7.0/resources/images.qrc
---- calibre-2.7.0.orig/resources/images.qrc 1989-12-31 22:00:00.000000000 -0200
-+++ calibre-2.7.0/resources/images.qrc 2014-10-24 15:04:21.821294414 -0200
-@@ -194,8 +194,6 @@
+diff -Nur calibre-2.27.0.orig/resources/images.qrc calibre-2.27.0/resources/images.qrc
+--- calibre-2.27.0.orig/resources/images.qrc 1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.27.0/resources/images.qrc 2015-05-04 23:50:46.566711080 -0300
+@@ -197,8 +197,6 @@
<file>images/mimetypes/svg.png</file>
<file>images/mimetypes/odt.png</file>
<file>images/mimetypes/epub.png</file>
@@ -10,16 +10,16 @@ diff -Nur calibre-2.7.0.orig/resources/images.qrc calibre-2.7.0/resources/images
<file>images/mimetypes/tpz.png</file>
<file>images/mimetypes/djvu.png</file>
<file>images/mimetypes/computer.png</file>
-@@ -215,4 +213,4 @@
+@@ -218,4 +216,4 @@
<file>images/mimetypes/html.png</file>
<file>images/mimetypes/lrx.png</file>
</qresource>
-</RCC>
\ No newline at end of file
+</RCC>
-diff -Nur calibre-1.204.1.orig/resources/mime.types calibre-1.204.1/resources/mime.types
---- calibre-1.204.1.orig/resources/mime.types 1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/resources/mime.types 2014-08-03 19:37:20.290255565 -0300
+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 @@
application/prs.nprend
application/prs.plucker
@@ -42,8 +42,8 @@ diff -Nur calibre-1.204.1.orig/resources/mime.types calibre-1.204.1/resources/mi
application/x-cbz cbz
-application/x-cbr cbr
application/x-cb7 cb7
+ application/x-cbc cbc
application/x-koboreader-ebook kobo
- image/wmf wmf
diff -Nur calibre-1.204.1.orig/session.vim calibre-1.204.1/session.vim
--- calibre-1.204.1.orig/session.vim 1989-12-31 22:00:00.000000000 -0200
+++ calibre-1.204.1/session.vim 2014-08-03 19:37:20.290255565 -0300
@@ -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-1.204.1.orig/src/calibre/__init__.py calibre-1.204.1/src/calibre/__init__.py
---- calibre-1.204.1.orig/src/calibre/__init__.py 1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/__init__.py 2014-08-03 19:37:20.290255565 -0300
-@@ -271,10 +271,7 @@
+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 @@
# 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-1.204.1.orig/src/calibre/__init__.py calibre-1.204.1/src/calib
from calibre.libunzip import extract as zipextract
extractor = zipextract
if extractor is None:
-@@ -283,9 +280,6 @@
+@@ -284,9 +281,6 @@
if ext in ['zip', 'cbz', 'epub', 'oebzip']:
from calibre.libunzip import extract as zipextract
extractor = zipextract
@@ -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-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 @@
+diff -Nur calibre-2.27.0.orig/src/calibre/customize/ui.py calibre-2.27.0/src/calibre/customize/ui.py
+--- calibre-2.27.0.orig/src/calibre/customize/ui.py 1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.27.0/src/calibre/customize/ui.py 2015-05-04 23:50:46.570044248 -0300
+@@ -449,7 +449,7 @@
if not is_disabled(plugin):
for format in plugin.file_types:
formats.add(format)
@@ -262,9 +262,9 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plugins/comic_input
is_image_collection = True
core_usage = -1
-diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py calibre-1.204.1/src/calibre/ebooks/conversion/plumber.py
---- calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py 1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/ebooks/conversion/plumber.py 2014-08-03 19:37:20.290255565 -0300
+diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/conversion/plumber.py calibre-2.27.0/src/calibre/ebooks/conversion/plumber.py
+--- calibre-2.27.0.orig/src/calibre/ebooks/conversion/plumber.py 1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.27.0/src/calibre/ebooks/conversion/plumber.py 2015-05-04 23:50:46.573377414 -0300
@@ -42,7 +42,7 @@
def supported_input_formats():
@@ -282,10 +282,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/conversion/plumber.py calibre-
+ARCHIVE_FMTS = ('zip', 'oebzip')
class Plumber(object):
- '''
-diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1.204.1/src/calibre/ebooks/metadata/archive.py
---- calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py 1989-12-31 22:00:00.000000000 -0200
-+++ calibre-1.204.1/src/calibre/ebooks/metadata/archive.py 2014-08-03 19:37:20.290255565 -0300
+
+diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.27.0/src/calibre/ebooks/metadata/archive.py
+--- calibre-2.27.0.orig/src/calibre/ebooks/metadata/archive.py 1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.27.0/src/calibre/ebooks/metadata/archive.py 2015-05-04 23:59:41.893272586 -0300
@@ -27,8 +27,6 @@
ans = None
if id_ == stringFileHeader:
@@ -295,7 +295,7 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1.
try:
stream.seek(pos)
except:
-@@ -40,29 +38,20 @@
+@@ -40,25 +38,16 @@
name = 'Archive Extract'
author = 'Kovid Goyal'
description = _('Extract common e-book formats from archives '
@@ -324,14 +324,18 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1.
+ zf = ZipFile(archive, 'r')
+ fnames = zf.namelist()
- fnames = [x for x in fnames if '.' in x and x.lower().rpartition('/')[-1] != 'thumbs.db']
+ def fname_ok(fname):
+ bn = os.path.basename(fname).lower()
+@@ -74,7 +63,7 @@
+
+ fnames = list(filter(fname_ok, fnames))
if is_comic(fnames):
- ext = '.cbr' if is_rar else '.cbz'
+ ext = '.cbz'
of = self.temporary_file('_archive_extract'+ext)
with open(archive, 'rb') as f:
of.write(f.read())
-@@ -78,12 +67,7 @@
+@@ -91,12 +80,7 @@
of = self.temporary_file('_archive_extract.'+ext)
with closing(of):
@@ -345,7 +349,7 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1.
return of.name
def get_comic_book_info(d, mi, series_index='volume'):
-@@ -141,10 +125,6 @@
+@@ -154,10 +138,6 @@
from calibre.utils.zipfile import ZipFile
zf = ZipFile(stream)
comment = zf.comment
@@ -356,10 +360,10 @@ diff -Nur calibre-1.204.1.orig/src/calibre/ebooks/metadata/archive.py calibre-1.
if comment:
import json
-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 @@
+diff -Nur calibre-2.27.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.27.0/src/calibre/ebooks/oeb/iterator/book.py
+--- calibre-2.27.0.orig/src/calibre/ebooks/oeb/iterator/book.py 1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.27.0/src/calibre/ebooks/oeb/iterator/book.py 2015-05-04 23:50:46.573377414 -0300
+@@ -128,7 +128,7 @@
self.spine = []
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')
@@ -387,9 +391,9 @@ diff -Nur calibre-2.10.0.orig/src/calibre/gui2/__init__.py calibre-2.10.0/src/ca
'zip' : 'zip',
'txt' : 'txt',
'text' : 'txt',
-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
+diff -Nur calibre-2.27.0.orig/src/calibre/gui2/actions/add.py calibre-2.27.0/src/calibre/gui2/actions/add.py
+--- calibre-2.27.0.orig/src/calibre/gui2/actions/add.py 1989-12-31 22:00:00.000000000 -0200
++++ calibre-2.27.0/src/calibre/gui2/actions/add.py 2015-05-04 23:50:46.573377414 -0300
@@ -38,8 +38,8 @@
(_('Text books'), ['txt', 'text', 'rtf']),
(_('PDF Books'), ['pdf', 'azw4']),
@@ -410,7 +414,7 @@ diff -Nur calibre-2.10.0.orig/src/calibre/gui2/actions/add.py calibre-2.10.0/src
self.create_menu_action(arm, 'recursive-single-archive', _(
'One book per directory in the archive')).triggered.connect(partial(self.add_archive, True))
self.create_menu_action(arm, 'recursive-multiple-archive', _(
-@@ -145,7 +145,7 @@
+@@ -199,7 +199,7 @@
def add_archive(self, single):
paths = choose_files(
self.gui, 'recursive-archive-add', _('Choose archive file'),
@@ -693,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.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 @@
+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 @@
msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42
@@ -705,7 +709,7 @@ diff -Nur calibre-2.10.0.orig/translations/calibre/main.pot calibre-2.10.0/trans
msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652
-@@ -11554,7 +11554,7 @@
+@@ -11820,7 +11820,7 @@
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 12:10:56 +0000