summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/calibre/PKGBUILD15
-rw-r--r--libre/calibre/incompatibility-pyqt5.4.1.patch28
2 files changed, 5 insertions, 38 deletions
diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 2eacbd6e3..686b9fbbe 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 128957 2015-03-08 19:47:53Z jelle $
+# $Id: PKGBUILD 129167 2015-03-13 09:55:18Z 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,8 +9,8 @@
pkgname=calibre
_pkgname=$pkgname-libre
-pkgver=2.20.0
-pkgrel=2.parabola1
+pkgver=2.21.0
+pkgrel=1.parabola1
pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
arch=('i686' 'x86_64' 'mips64el')
url="http://$pkgname-ebook.com/"
@@ -31,11 +31,9 @@ conflicts=($_pkgname)
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"
- 'incompatibility-pyqt5.4.1.patch'
'libre.patch')
-mkmd5sums=('94f033006e6cc7b96abf62944368fc83')
-md5sums=('7511774936f784ff6d716552fd0cedf6'
- 'cb28c339c0ab543a96e56363eeef3e8c'
+mkmd5sums=('61edafbd4ef5c4162120722b94b7ee72')
+md5sums=('54ee7ca76b25a358fc83337ca7fb42f7'
'7e964e5c88affc299b69e8c2744a4393')
mksource(){
@@ -79,9 +77,6 @@ prepare(){
-e "s/'ctc-posml'/'text' not in mt and 'pdf' not in mt and 'xhtml'/" \
-e "s/^Name=calibre/Name=Calibre/g" \
-i src/$pkgname/linux.py
-
- # Fixes FS#43934
- patch -Np1 -i $srcdir/incompatibility-pyqt5.4.1.patch
}
build() {
diff --git a/libre/calibre/incompatibility-pyqt5.4.1.patch b/libre/calibre/incompatibility-pyqt5.4.1.patch
deleted file mode 100644
index e2f44e19e..000000000
--- a/libre/calibre/incompatibility-pyqt5.4.1.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Thu, 5 Mar 2015 07:50:28 +0530
-Subject: [PATCH] =?UTF-8?q?Fix=20incompatibility=20with=20PyQt=205.4.1.=20?=
- =?UTF-8?q?Fixes=20#1427684=20["TypeError:=20QPixmap():=20argument=201=20h?=
- =?UTF-8?q?as=20unexpected=20type"=20=E2=80=93=20incompatibility=20with=20?=
- =?UTF-8?q?Qt=205.4.1=3F](https://bugs.launchpad.net/calibre/+bug/1427684)?=
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
----
- src/calibre/gui2/widgets.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/calibre/gui2/widgets.py b/src/calibre/gui2/widgets.py
-index 0e84267..ed40a97 100644
---- a/src/calibre/gui2/widgets.py
-+++ b/src/calibre/gui2/widgets.py
-@@ -295,7 +295,7 @@ class ImageView(QWidget, ImageDropMixin): # {{{
- def __init__(self, parent=None, show_size_pref_name=None, default_show_size=False):
- QWidget.__init__(self, parent)
- self.show_size_pref_name = ('show_size_on_cover_' + show_size_pref_name) if show_size_pref_name else None
-- self._pixmap = QPixmap(self)
-+ self._pixmap = QPixmap()
- self.setMinimumSize(QSize(150, 200))
- ImageDropMixin.__init__(self)
- self.draw_border = True