From f5f74a2423a8cfd6423594a765eb37d52816adfc Mon Sep 17 00:00:00 2001
From: Jesús Eduardo <heckyel@openmailbox.org>
Date: Tue, 16 May 2017 12:08:30 -0500
Subject: calibre: update libre.patch and PKGBUILD

---
 libre/calibre/PKGBUILD    | 10 ++++------
 libre/calibre/libre.patch |  5 +++--
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/libre/calibre/PKGBUILD b/libre/calibre/PKGBUILD
index c6a378b19..708a31159 100644
--- a/libre/calibre/PKGBUILD
+++ b/libre/calibre/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id: PKGBUILD 217087 2017-03-18 14:19:47Z 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>
@@ -11,9 +10,9 @@
 
 pkgname=calibre
 pkgver=2.85.1
-pkgrel=2.parabola1
+pkgrel=2.parabola2
 pkgdesc="Ebook management application, without nonfree decompression engine for RAR archives"
-arch=('i686' 'x86_64' 'armv7h')
+arch=('x86_64' 'i686' 'armv7h')
 url="https://calibre-ebook.com/"
 license=('GPL3')
 depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
@@ -26,8 +25,7 @@ depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
          'desktop-file-utils' 'gtk-update-icon-cache' 'optipng' 'udisks2')
 makedepends=('qt5-x11extras' 'xdg-utils')
 optdepends=('ipython2: to use calibre-debug'
-            'poppler: required for converting pdf to html'
-)
+            'poppler: required for converting pdf to html')
 replaces=($pkgname-libre)
 conflicts=($pkgname-libre)
 source=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz"
@@ -37,7 +35,7 @@ source=("http://download.$pkgname-ebook.com/${pkgver}/$pkgname-${pkgver}.tar.xz"
         '0001-Remove-code-that-contacts-calibre-servers-to-check-u.patch')
 sha512sums=('ce29924213fa7461bbf2fc62f26bd53e4eafdf3b0dd58e241071592be4ee038cdb3ac6ac2982229dd0e52595a93aca7d921640ea55796950d1f3ac3c2742af4f'
             'SKIP'
-            'e024f634bdab8f58400a50d139883f1672767e36164555ca158ef8b8b49cff490e0dfb4294d9da1e567fdc53acc87f510a011f93ba3bd2bc0ee361ae6653a68b'
+            '4fc44d06ed9a1107a2eb17e9ab9b0b502dc4210d0776350d285d9b8a52e35b87f15457bcc8fe57336289c6f5700be7ef1c070b14925a8f761b9b2b61c0fd0e5e'
             'e6c3b1ddbd72c4e1cd1b883283102c7e185e2badded24b9d1920364b4ec96ad60fd68d558bfce69e90739568de01aae81ae5ed349f1700697ba153f6d251e2ba'
             '29b57398f8243bfa452983413f34b48d69da1577286455ed1356b2c1d12043af70ad389d02a8d64ad848ba4883243b66c7aab7805f3a82deac611bb41e0556f7')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C')
diff --git a/libre/calibre/libre.patch b/libre/calibre/libre.patch
index 3ac517740..e899c836a 100644
--- a/libre/calibre/libre.patch
+++ b/libre/calibre/libre.patch
@@ -292,7 +292,7 @@ index bf8853b..917c485 100644
  
  class Plumber(object):
 diff --git a/src/calibre/ebooks/metadata/archive.py b/src/calibre/ebooks/metadata/archive.py
-index f5c0b7b..28c4d80 100644
+index f5c0b7b..5a1d03b 100644
 --- a/src/calibre/ebooks/metadata/archive.py
 +++ b/src/calibre/ebooks/metadata/archive.py
 @@ -29,8 +29,6 @@ def archive_type(stream):
@@ -310,9 +310,10 @@ index f5c0b7b..28c4d80 100644
      description = _('Extract common e-book formats from archive files '
 -        '(ZIP/RAR). Also try to autodetect if they are actually '
 -        'CBZ/CBR files.')
+-    file_types = set(['zip', 'rar'])
 +        '(ZIP). Also try to autodetect if they are actually '
 +        'CBZ files.')
-     file_types = set(['zip', 'rar'])
++    file_types = set(['zip'])
      supported_platforms = ['windows', 'osx', 'linux']
      on_import = True
  
-- 
cgit v1.2.3