Date: Sunday, April 12, 2015 @ 20:18:04 Author: jelle Revision: 131253
upgpkg: calibre 2.24.0-1 Modified: calibre/trunk/PKGBUILD Deleted: calibre/trunk/incompatibility-pyqt5.4.1.patch ---------------------------------+ PKGBUILD | 6 +++--- incompatibility-pyqt5.4.1.patch | 28 ---------------------------- 2 files changed, 3 insertions(+), 31 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2015-04-12 16:06:43 UTC (rev 131252) +++ PKGBUILD 2015-04-12 18:18:04 UTC (rev 131253) @@ -7,8 +7,8 @@ # Contributor: Larry Hajali <[email protected]> pkgname=calibre -pkgver=2.23.0 -pkgrel=2 +pkgver=2.24.0 +pkgrel=1 pkgdesc="Ebook management application" arch=('i686' 'x86_64') url="http://calibre-ebook.com/"; @@ -26,7 +26,7 @@ ) install=calibre.install source=("http://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz";) -md5sums=('096bb1c01bfe98fce3647e78c8d594ca') +md5sums=('864eb4f736ca89e4bab24b0a8a963230') prepare(){ cd "${srcdir}/${pkgname}-${pkgver}" Deleted: incompatibility-pyqt5.4.1.patch =================================================================== --- incompatibility-pyqt5.4.1.patch 2015-04-12 16:06:43 UTC (rev 131252) +++ incompatibility-pyqt5.4.1.patch 2015-04-12 18:18:04 UTC (rev 131253) @@ -1,28 +0,0 @@ -From 72d47ba9377d70e786bf3d93b323544188c894bd Mon Sep 17 00:00:00 2001 -From: Kovid Goyal <[email protected]> -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
