From cd74bb8622aeb1536dddc56e1c06c6fb41c7d717 Mon Sep 17 00:00:00 2001
From: gnastyle <BM-2cTv4XtvC9UQ8TdFCfPNySv2omc8T6m3sv@bitmessage.ch>
Date: Sun, 26 Mar 2017 15:14:28 +0200
Subject: [PATCH] calibre: add udisks2 to dep, also we don't need html5 patch
 anymore

---
 calibre/PKGBUILD | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/calibre/PKGBUILD b/calibre/PKGBUILD
index 23e6a6242..b6d00bc1f 100644
--- a/calibre/PKGBUILD
+++ b/calibre/PKGBUILD
@@ -1,21 +1,20 @@
 pkgname=calibre
 pkgver=2.82.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Ebook management application"
 arch=('x86_64')
 url="https://calibre-ebook.com/"
 license=('GPL3')
-depends=('python2-six' 'python2-dateutil' 'python2-cssutils' 'python2-cherrypy'
+depends=('python2-six' 'python2-dateutil' 'python2-cssutils'
          'python2-mechanize' 'podofo' 'libwmf'
          'imagemagick' 'chmlib' 'python2-lxml' 'libusbx'
          'python2-pillow' 'shared-mime-info' 'python2-dns'
          'python2-pyqt5' 'python2-psutil' 'icu' 'libmtp' 'python2-dbus'
          'python2-netifaces' 'python2-cssselect' 'python2-apsw' 'qt5-webkit'
-         'qt5-svg' 'python2-chardet' 'python2-html5lib' 'python2-pygments' 'mtdev'
-         'desktop-file-utils')
+         'qt5-svg' 'python2-pygments' 'mtdev'
+         'desktop-file-utils' 'udisks2')
 makedepends=('qt5-x11extras' 'xdg-utils')
 optdepends=('ipython2: to use calibre-debug'
-            'udisks: required for mounting certain devices'
             'poppler: required for converting pdf to html')
 screenshot=('https://lh5.googleusercontent.com/_lG58t3XWd3c/TcNwiXkAx_I/AAAAAAAAAEc/M34I4uY9UUY/s800/gui.jpeg')
 install=${pkgname}.install
@@ -27,11 +26,8 @@ sha256sums=('137995abe467fcb951c1d42583305ebec7b8ca403c44895e70f82a2d6156711c'
 prepare(){
   cd "${pkgname}-${pkgver}"
 
-  # Remove unneeded files and libs
-  rm -rf resources/${pkgname}-portable.* \
-         src/cherrypy \
-         src/html5lib \
-         src/chardet
+  # Remove unneeded files
+  rm -rf resources/${pkgname}-portable.*
 
   # Desktop integration (e.g. enforce arch defaults)
   sed -e "/self.create_uninstaller()/,/os.rmdir(config_dir)/d" \
@@ -40,9 +36,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/calibre/linux.py
-
-  # Fix broken HTML5 imports.
-  patch -N -p0 < ../../fix_html5_imports.patch
 }
 
 build() {