From 5c48ba493e722cdf7fc5c734c8faf0eada68f721 Mon Sep 17 00:00:00 2001
From: André Fabian Silva Delgado <emulatorman@parabola.nu>
Date: Sun, 26 Jul 2015 13:36:33 -0300
Subject: calibre-2.33.0-1.parabola1: updating version

---
 libre/calibre/PKGBUILD      | 14 +++++-------
 libre/calibre/pyqt5.5.patch | 55 ---------------------------------------------
 2 files changed, 5 insertions(+), 64 deletions(-)
 delete mode 100644 libre/calibre/pyqt5.5.patch

(limited to 'libre/calibre')

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index 01d32b9e0..e10366469 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 137299 2015-07-23 08:13:21Z jelle $
+# $Id: PKGBUILD 137395 2015-07-24 20:25:03Z arojas $
 # 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.32.1
-pkgrel=2.parabola1
+pkgver=2.33.0
+pkgrel=1.parabola1
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
 arch=('i686' 'x86_64')
 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"
-        'pyqt5.5.patch'
         'libre.patch')
-mkmd5sums=('54e8bcfdf1e74595bd7611dd61bac20a')
-md5sums=('3a326de1b2a0042a93f0154e896886c2'
-         'bec94ae1af7725c2ddc5981e606a3906'
+mkmd5sums=('7c08641db7f014546bb2b215c392b877')
+md5sums=('d1fefe748cd662f19cb90944d5830241'
          '0c70c8d2fd4b11c51d061596e3c8d487')
 
 mksource(){
@@ -60,8 +58,6 @@ prepare(){
          src/html5lib \
          src/chardet
 
-  patch -Np1 -i $srcdir/pyqt5.5.patch
-
   sed -i "s/shlex.split(ldflags)/& + ['-fPIC']/" setup/extensions.py
 
   # Use python2
diff --git a/libre/calibre/pyqt5.5.patch b/libre/calibre/pyqt5.5.patch
deleted file mode 100644
index aafb3f32d..000000000
--- a/libre/calibre/pyqt5.5.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 8f75f2d5ad17ef35d52a9dc1a137c36d42e8454e Mon Sep 17 00:00:00 2001
-From: Kovid Goyal <kovid@kovidgoyal.net>
-Date: Thu, 23 Jul 2015 11:47:53 +0530
-Subject: [PATCH] More compatibility fixes for PyQt 5.5
-
----
- src/calibre/gui2/library/alternate_views.py | 2 +-
- src/calibre/gui2/library/delegates.py       | 4 ++--
- src/calibre/gui2/library/views.py           | 2 +-
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/calibre/gui2/library/alternate_views.py b/src/calibre/gui2/library/alternate_views.py
-index f492343..813ff48 100644
---- a/src/calibre/gui2/library/alternate_views.py
-+++ b/src/calibre/gui2/library/alternate_views.py
-@@ -101,7 +101,7 @@ def drag_data(self):
-     selected = self.get_selected_ids()
-     ids = ' '.join(map(str, selected))
-     md = QMimeData()
--    md.setData('application/calibre+from_library', ids)
-+    md.setData('application/calibre+from_library', ids.encode('utf-8'))
-     fmt = prefs['output_format']
- 
-     def url_for_id(i):
-diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py
-index eed3ed8..5e0344c 100644
---- a/src/calibre/gui2/library/delegates.py
-+++ b/src/calibre/gui2/library/delegates.py
-@@ -55,11 +55,11 @@ def updateEditorGeometry(self, editor, option, index):
-         # Now get the size of the combo/spinner arrows and add them to the needed width
-         if isinstance(editor, (QComboBox, QDateTimeEdit)):
-             r = style.subControlRect(QStyle.CC_ComboBox, QStyleOptionComboBox(),
--                                      QStyle.SC_ComboBoxArrow)
-+                                      QStyle.SC_ComboBoxArrow, editor)
-             new_width += r.width()
-         elif isinstance(editor, (QSpinBox, QDoubleSpinBox)):
-             r = style.subControlRect(QStyle.CC_SpinBox, QStyleOptionSpinBox(),
--                                  QStyle.SC_SpinBoxUp)
-+                                  QStyle.SC_SpinBoxUp, editor)
-             new_width += r.width()
- 
-         # Compute the maximum we can show if we consume the entire viewport
-diff --git a/src/calibre/gui2/library/views.py b/src/calibre/gui2/library/views.py
-index 008721e..7e1743d 100644
---- a/src/calibre/gui2/library/views.py
-+++ b/src/calibre/gui2/library/views.py
-@@ -1098,7 +1098,7 @@ def drag_data(self):
-         rows = self.selectionModel().selectedRows()
-         paths = [force_unicode(p, enc=filesystem_encoding) for p in m.paths(rows) if p]
-         md = QMimeData()
--        md.setData('application/calibre+from_device', 'dummy')
-+        md.setData('application/calibre+from_device', b'dummy')
-         md.setUrls([QUrl.fromLocalFile(p) for p in paths])
-         drag = QDrag(self)
-         drag.setMimeData(md)
-- 
cgit v1.2.3-54-g00ecf