diff options
| author | Eli Schwartz | 2020-09-18 15:24:41 -0400 |
|---|---|---|
| committer | Eli Schwartz | 2020-09-18 15:24:41 -0400 |
| commit | bb33305ba24edc67d7bfda577fb9ceb8236ca874 (patch) | |
| tree | 9be2420e2d45aa781415a95a46eacec402811523 | |
| parent | 03e4aa90767bde58ebac85b96c7df04a60b63d15 (diff) | |
| download | aur-bb33305ba24edc67d7bfda577fb9ceb8236ca874.tar.gz | |
upgpkg: calibre-git 4.23.0.r599.g9ec29bb548-1
- migrate from sip 4 -> 5
- drop old python3 porting env variable which should have been removed in
commit 9b88c9d257a4c1320bb86b9fc3e14c4978e1a30e
(AUR: 03e4aa90767bde58ebac85b96c7df04a60b63d15)
- and exclude one test that causes testsuite segfaults after qt 5.15.1 inside makechrootpkg,
but outside of systemd-nspawn passes.
see: https://github.com/kovidgoyal/calibre/commit/28ef780d9911d598314d98bdfc3b1c88a94681df
| -rw-r--r-- | .SRCINFO | 5 | ||||
| -rw-r--r-- | PKGBUILD | 9 |
2 files changed, 9 insertions, 5 deletions
@@ -1,6 +1,6 @@ pkgbase = calibre-git pkgdesc = Ebook management application - pkgver = 4.23.0.r477.g079cbff565 + pkgver = 4.23.0.r599.g9ec29bb548 pkgrel = 1 url = https://calibre-ebook.com/ arch = i686 @@ -9,7 +9,8 @@ pkgbase = calibre-git checkdepends = xorg-server-xvfb makedepends = git makedepends = qt5-x11extras - makedepends = sip + makedepends = sip5 + makedepends = pyqt-builder makedepends = xdg-utils makedepends = rapydscript-ng makedepends = python-sphinx @@ -10,7 +10,7 @@ pkgbase=calibre-git pkgname=calibre-git -pkgver=4.23.0.r477.g079cbff565 +pkgver=4.23.0.r599.g9ec29bb548 pkgrel=1 _dictionaries_commit="libreoffice-6.4.0.0.beta1" pkgdesc="Ebook management application" @@ -24,7 +24,7 @@ _py_deps=('apsw' 'beautifulsoup4' 'cssselect' 'css-parser' 'dateutil' 'dbus' 'dn depends=('chmlib' 'hunspell' 'hyphen' 'icu' 'jxrlib' 'libmtp' 'libusbx' 'libwmf' 'mathjax' 'mtdev' 'optipng' 'podofo' "${_py_deps[@]/#/python-}" 'qt5-svg' 'udisks2') -makedepends=('git' 'qt5-x11extras' 'sip' 'xdg-utils' 'rapydscript-ng' 'python-sphinx') +makedepends=('git' 'qt5-x11extras' 'sip5' 'pyqt-builder' 'xdg-utils' 'rapydscript-ng' 'python-sphinx') checkdepends=('xorg-server-xvfb') optdepends=('poppler: required for converting pdf to html') provides=("${pkgname%-git}") @@ -91,7 +91,10 @@ check() { # without xvfb-run this fails with much "Control socket failed to recv(), resetting" # ERROR: test_websocket_perf (calibre.srv.tests.web_sockets.WebSocketTest) # one or two tests are a bit flaky, but the python3 build seems to succeed more often - LANG='en_US.UTF-8' xvfb-run env CALIBRE_PY3_PORT=1 python3 setup.py test + # + # test_ajax_book segfaults on qt >=5.15.1 inside of qt itself, but only in nspawn containers + # see https://github.com/kovidgoyal/calibre/commit/28ef780d9911d598314d98bdfc3b1c88a94681df + LANG='en_US.UTF-8' xvfb-run python3 setup.py test --exclude-test-name=test_ajax_book } package() { |