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.patch91
2 files changed, 41 insertions, 60 deletions
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index cc49513b7..3f26592af 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 146873 2015-11-15 17:12:25Z jelle $
+# $Id: PKGBUILD 147874 2015-11-27 13:22:10Z 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 @@
# Contributor: Márcio Silva <coadde@parabola.nu>
pkgname=calibre
-pkgver=2.44.1
+pkgver=2.45.0
pkgrel=1.parabola1
pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
arch=('i686' 'x86_64')
@@ -34,9 +34,9 @@ install=calibre.install
mksource=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz")
source=("https://repo.parabola.nu/other/${pkgname}-libre/${pkgname}-libre-${pkgver}.tar.xz"
'libre.patch')
-mkmd5sums=('c49f44da6f164c4aa63146cef8a8cbf9')
-md5sums=('346734ec105800bff6a91d13d5edd521'
- '7e07f0c7cf71fdfd5950e5d648b07fd0')
+mkmd5sums=('0728b635ad814fb51595e9535a36b7ff')
+md5sums=('72bb58b59c0429560e5bc8b9182de29e'
+ 'fde5c80d9d407e5510d5d1947a4adb6c')
mksource(){
cd "${pkgname}-${pkgver}"
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 1f1e56c7e..b1465a464 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -1,7 +1,7 @@
-diff -Nur calibre-2.34.0.orig/resources/images.qrc calibre-2.34.0/resources/images.qrc
---- calibre-2.34.0.orig/resources/images.qrc 2015-04-25 04:35:00.000000000 -0300
-+++ calibre-2.34.0/resources/images.qrc 2015-08-11 16:40:39.531800891 -0300
-@@ -197,8 +197,6 @@
+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 @@
<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.34.0.orig/resources/images.qrc calibre-2.34.0/resources/imag
<file>images/mimetypes/tpz.png</file>
<file>images/mimetypes/djvu.png</file>
<file>images/mimetypes/computer.png</file>
-@@ -218,4 +216,4 @@
+@@ -217,4 +215,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.34.0.orig/setup/extensions.py calibre-2.34.0/setup/extensions.py
---- calibre-2.34.0.orig/setup/extensions.py 2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/setup/extensions.py 2015-08-11 16:40:39.532800843 -0300
-@@ -239,24 +239,6 @@
+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 @@
sip_files=['calibre/ebooks/pdf/render/qt_hack.sip']
),
@@ -132,11 +132,11 @@ diff -Nur calibre-2.34.0.orig/src/calibre/__init__.py calibre-2.34.0/src/calibre
if extractor is None:
raise Exception('Unknown archive type')
extractor(path, dir)
-diff -Nur calibre-2.34.0.orig/src/calibre/constants.py calibre-2.34.0/src/calibre/constants.py
---- calibre-2.34.0.orig/src/calibre/constants.py 2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/constants.py 2015-08-11 16:41:09.078368837 -0300
-@@ -137,7 +137,6 @@
- 'speedup',
+diff -Nur calibre-2.45.0.orig/src/calibre/constants.py calibre-2.45.0/src/calibre/constants.py
+--- calibre-2.45.0.orig/src/calibre/constants.py 2015-11-27 00:22:13.000000000 -0300
++++ calibre-2.45.0/src/calibre/constants.py 2015-11-27 13:00:44.758902890 -0300
+@@ -142,7 +142,6 @@
+ 'zlib2',
'html',
'freetype',
- 'unrar',
@@ -283,9 +283,9 @@ diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/conversion/plumber.py calibre-2
class Plumber(object):
-diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.34.0/src/calibre/ebooks/metadata/archive.py
---- calibre-2.34.0.orig/src/calibre/ebooks/metadata/archive.py 2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/ebooks/metadata/archive.py 2015-08-11 16:40:39.536800650 -0300
+diff -Nur calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.45.0/src/calibre/ebooks/metadata/archive.py
+--- calibre-2.45.0.orig/src/calibre/ebooks/metadata/archive.py 2015-11-27 00:22:13.000000000 -0300
++++ calibre-2.45.0/src/calibre/ebooks/metadata/archive.py 2015-11-27 13:00:44.762236057 -0300
@@ -27,8 +27,6 @@
ans = None
if id_ == stringFileHeader:
@@ -349,7 +349,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.3
return of.name
def get_comic_book_info(d, mi, series_index='volume'):
-@@ -154,10 +138,6 @@
+@@ -157,10 +141,6 @@
from calibre.utils.zipfile import ZipFile
zf = ZipFile(stream)
comment = zf.comment
@@ -360,10 +360,10 @@ diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/metadata/archive.py calibre-2.3
if comment:
import json
-diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.34.0/src/calibre/ebooks/oeb/iterator/book.py
---- calibre-2.34.0.orig/src/calibre/ebooks/oeb/iterator/book.py 2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/ebooks/oeb/iterator/book.py 2015-08-11 16:40:39.536800650 -0300
-@@ -128,7 +128,7 @@
+diff -Nur calibre-2.45.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.45.0/src/calibre/ebooks/oeb/iterator/book.py
+--- calibre-2.45.0.orig/src/calibre/ebooks/oeb/iterator/book.py 2015-11-27 00:22:13.000000000 -0300
++++ calibre-2.45.0/src/calibre/ebooks/oeb/iterator/book.py 2015-11-27 13:00:44.762236057 -0300
+@@ -140,7 +140,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')
@@ -372,28 +372,9 @@ diff -Nur calibre-2.34.0.orig/src/calibre/ebooks/oeb/iterator/book.py calibre-2.
for i in ordered:
spath = i.path
mt = None
-diff -Nur calibre-2.34.0.orig/src/calibre/gui2/__init__.py calibre-2.34.0/src/calibre/gui2/__init__.py
---- calibre-2.34.0.orig/src/calibre/gui2/__init__.py 2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/gui2/__init__.py 2015-08-11 16:40:39.536800650 -0300
-@@ -501,7 +501,6 @@
- 'png' : 'png',
- 'bmp' : 'bmp',
- 'cbz' : 'cbz',
-- 'cbr' : 'cbr',
- 'svg' : 'svg',
- 'html' : 'html',
- 'htmlz' : 'html',
-@@ -513,7 +512,6 @@
- 'lrx' : 'lrx',
- 'pdf' : 'pdf',
- 'pdr' : 'zero',
-- 'rar' : 'rar',
- 'zip' : 'zip',
- 'txt' : 'txt',
- 'text' : 'txt',
-diff -Nur calibre-2.34.0.orig/src/calibre/gui2/actions/add.py calibre-2.34.0/src/calibre/gui2/actions/add.py
---- calibre-2.34.0.orig/src/calibre/gui2/actions/add.py 2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/gui2/actions/add.py 2015-08-11 16:40:39.537800601 -0300
+diff -Nur calibre-2.45.0.orig/src/calibre/gui2/actions/add.py calibre-2.45.0/src/calibre/gui2/actions/add.py
+--- calibre-2.45.0.orig/src/calibre/gui2/actions/add.py 2015-11-27 00:22:13.000000000 -0300
++++ calibre-2.45.0/src/calibre/gui2/actions/add.py 2015-11-27 13:00:44.762236057 -0300
@@ -38,8 +38,8 @@
(_('Text books'), ['txt', 'text', 'rtf']),
(_('PDF Books'), ['pdf', 'azw4']),
@@ -406,7 +387,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/gui2/actions/add.py calibre-2.34.0/src
]
@@ -66,7 +66,7 @@
- 'sub directories (Multiple books per directory, assumes every '
+ 'sub-directories (Multiple books per directory, assumes every '
'ebook file is a different book)')).triggered.connect(
self.add_recursive_multiple)
- arm = self.add_archive_menu = self.add_menu.addMenu(_('Add multiple books from archive (ZIP/RAR)'))
@@ -460,10 +441,10 @@ 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.34.0.orig/src/calibre/test_build.py calibre-2.34.0/src/calibre/test_build.py
---- calibre-2.34.0.orig/src/calibre/test_build.py 2015-08-07 01:09:19.000000000 -0300
-+++ calibre-2.34.0/src/calibre/test_build.py 2015-08-11 16:40:39.538800552 -0300
-@@ -157,11 +157,6 @@
+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 @@
raise RuntimeError('PIL choked!')
print ('PIL OK!')
@@ -475,7 +456,7 @@ diff -Nur calibre-2.34.0.orig/src/calibre/test_build.py calibre-2.34.0/src/calib
def test_ssl():
import ssl
ssl
-@@ -239,7 +234,6 @@
+@@ -251,7 +246,6 @@
test_sqlite()
test_apsw()
test_imaging()
@@ -697,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.34.0.orig/translations/calibre/main.pot calibre-2.34.0/translations/calibre/main.pot
---- calibre-2.34.0.orig/translations/calibre/main.pot 2015-08-07 00:42:42.000000000 -0300
-+++ calibre-2.34.0/translations/calibre/main.pot 2015-08-11 16:40:39.544800262 -0300
-@@ -4120,7 +4120,7 @@
+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 @@
msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/archive.py:42
@@ -709,7 +690,7 @@ diff -Nur calibre-2.34.0.orig/translations/calibre/main.pot calibre-2.34.0/trans
msgstr ""
#: /home/kovid/work/calibre/src/calibre/ebooks/metadata/book/base.py:652
-@@ -11904,7 +11904,7 @@
+@@ -12030,7 +12030,7 @@
msgstr ""
#: /home/kovid/work/calibre/src/calibre/gui2/dialogs/comicconf.py:33
generated by cgit v1.2.3-2-g168b (git 2.25.1) at 2024-12-01 20:53:11 +0000