diff --git a/srcpkgs/calibre/patches/disable-unrar-test.patch b/srcpkgs/calibre/patches/disable-unrar-test.patch deleted file mode 100644 index bcbe25335a3..00000000000 --- a/srcpkgs/calibre/patches/disable-unrar-test.patch +++ /dev/null @@ -1,27 +0,0 @@ -Source: Debian - ---- - src/calibre/test_build.py | 5 +++++ - 1 file changed, 5 insertions(+) - ---- src/calibre/test_build.py -+++ src/calibre/test_build.py -@@ -17,6 +17,10 @@ from polyglot.builtins import iteritems, - - is_ci = os.environ.get('CI', '').lower() == 'true' - -+try: -+ import unrardll -+except: -+ unrardll = None - - class BuildTest(unittest.TestCase): - -@@ -265,6 +269,7 @@ class BuildTest(unittest.TestCase): - from calibre.gui2.win_file_dialogs import test - test() - -+ @unittest.skipUnless(unrardll, 'Module unrardll is missing') - def test_unrar(self): - from calibre.utils.unrar import test_basic - test_basic() diff --git a/srcpkgs/calibre/template b/srcpkgs/calibre/template index f9ae0a5923b..cd3f2d2ffd7 100644 --- a/srcpkgs/calibre/template +++ b/srcpkgs/calibre/template @@ -1,7 +1,7 @@ # Template file for 'calibre' pkgname=calibre -version=4.13.0 -revision=3 +version=4.14.0 +revision=1 build_style=python2-module pycompile_dirs="/usr/lib/calibre/" hostmakedepends="pkg-config python-BeautifulSoup4 python-Pillow python-PyQt5-svg @@ -18,18 +18,20 @@ depends="desktop-file-utils optipng poppler-utils python-BeautifulSoup4 python-dnspython python-feedparser python-html5-parser python-mechanize python-msgpack python-netifaces python-psutil python-regex python-html2text qt5-webengine" +checkdepends="${depends} libjpeg-turbo-tools jxrlib" short_desc="Ebook management application" -maintainer="bra1nwave " +maintainer="Orphaned " license="GPL-3.0-only" homepage="https://calibre-ebook.com" changelog="https://raw.githubusercontent.com/kovidgoyal/calibre/master/Changelog.yaml" distfiles="https://download.calibre-ebook.com/${version}/calibre-${version}.tar.xz" -checksum=f9587dea4f9ea76c6a5ec11b04ee66d0199d4ab3a4aad8c87966fed8ee76e1f6 +checksum=1c0dd818f602d76724aa8512a23f51101bf385233e2e5cc1cd31cae4a90f0e21 nocross=yes do_configure() { # Remove unneeded files and libs - rm -rf resources/${pkgname}-portable.* + rm -rf resources/${pkgname}-portable.* \ + src/biplist # Desktop integration (e.g. enforce arch defaults) vsed -i src/calibre/linux.py \ @@ -44,9 +46,12 @@ do_build() { python2 setup.py rapydscript } -# requires an X11 environment... do_check() { - : + # qt test crashes without any error messages + # disabled for now + python2 setup.py test \ + --exclude-test-name unrar \ + --exclude-test-name qt } do_install() {