[arch-commits] Commit in calibre/trunk (PKGBUILD)

[Eli Schwartz]

    Date: Friday, April 19, 2019 @ 04:39:12
  Author: eschwartz
Revision: 452014

upgpkg: calibre 3.41.0-1

upstream release
major refactorings in preparation for python3 support; has been beta'ed for a while
Some vendored code removed in favor of system dependencies

Modified:
  calibre/trunk/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-19 01:41:06 UTC (rev 452013)
+++ PKGBUILD	2019-04-19 04:39:12 UTC (rev 452014)
@@ -7,17 +7,17 @@
 # Contributor: Larry Hajali <larryhaja at gmail.com>
 
 pkgname=calibre
-pkgver=3.40.1
-pkgrel=2
+pkgver=3.41.0
+pkgrel=1
 pkgdesc="Ebook management application"
 arch=('x86_64')
 url="https://calibre-ebook.com/"
 license=('GPL3')
-_py_deps=('apsw' 'cssselect' 'css-parser' 'dateutil' 'dbus' 'dnspython' 'dukpy'
-          'feedparser' 'html5-parser' 'lxml' 'markdown' 'mechanize' 'msgpack'
+_py_deps=('apsw' 'beautifulsoup4' 'cssselect' 'css-parser' 'dateutil' 'dbus' 'dnspython' 'dukpy'
+          'feedparser' 'html2text' 'html5-parser' 'lxml' 'markdown' 'mechanize' 'msgpack'
           'netifaces' 'unrardll' 'pillow' 'psutil' 'pygments' 'pyqt5' 'regex')
 depends=('chmlib' 'icu' 'jxrlib' 'libmtp' 'libusbx' 'libwmf' 'mathjax' 'mtdev' 'optipng'
-         'podofo'  "${_py_deps[@]/#/python2-}" 'qt5-svg' 'qt5-webkit' 'udisks2')
+         'podofo' "${_py_deps[@]/#/python2-}" 'qt5-svg' 'qt5-webkit' 'udisks2')
 makedepends=('qt5-x11extras' 'sip' 'xdg-utils')
 checkdepends=('xorg-server-xvfb')
 optdepends=('ipython2: to use calibre-debug'
@@ -24,8 +24,10 @@
             'poppler: required for converting pdf to html')
 source=("https://download.calibre-ebook.com/${pkgver}/calibre-${pkgver}.tar.xz"
         "https://calibre-ebook.com/signatures/${pkgname}-${pkgver}.tar.xz.sig")
-sha256sums=('78015baefc8498a25d90ec22afe1ff3353abe6211cb7f39e3ab97ad715c233e8'
+sha256sums=('77788131daaeb53b86333e9fd4a255998705c832f30995d05e01ceed2a47a350'
             'SKIP')
+b2sums=('1fcc89d6cd79ca6b578d2816eb9aea8387be21ee1c51495eb83062ee997394774817379ea785cb93f61a721987a1a5b1dbbd55dce3cc469f73aefb1c42cbea49'
+        'SKIP')
 validpgpkeys=('3CE1780F78DD88DF45194FD706BC317B515ACE7C') # Kovid Goyal (New longer key) <kovid at kovidgoyal.net>
 
 prepare(){
@@ -39,6 +41,11 @@
       -e "s/^Name=calibre/Name=Calibre/g" \
       -i  src/calibre/linux.py
 
+  # cherry-picked bits of python2-backports.functools_lru_cache
+  # needed for frozen builds + beautifulsoup4
+  # see https://github.com/kovidgoyal/calibre/commit/b177f0a1096b4fdabd8772dd9edc66662a69e683#commitcomment-33169700
+  rm -r src/backports
+
   cd resources
 
   # Remove unneeded files