commit: 0085245112be3863c496aa7a6f7692aa5013f78c
Author: Eli Schwartz <eschwartz93 <AT> gmail <DOT> com>
AuthorDate: Mon Oct 2 23:41:37 2023 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Wed Oct 18 04:26:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00852451
app-text/calibre: add dependency necessary for complete image support
Drops the necessity of a testsuite patch.
Signed-off-by: Eli Schwartz <eschwartz93 <AT> gmail.com>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
app-text/calibre/calibre-5.44.0-r2.ebuild | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/app-text/calibre/calibre-5.44.0-r2.ebuild
b/app-text/calibre/calibre-5.44.0-r2.ebuild
index 8a63bfb638e5..b47c8eb32888 100644
--- a/app-text/calibre/calibre-5.44.0-r2.ebuild
+++ b/app-text/calibre/calibre-5.44.0-r2.ebuild
@@ -35,7 +35,7 @@ LICENSE="
OFL-1.1
PSF-2
"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
SLOT="0"
IUSE="ios +udisks"
@@ -85,6 +85,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
>=dev-python/PyQtWebEngine-5.15.5_pre2108100905[${PYTHON_USEDEP}]
dev-python/regex[${PYTHON_USEDEP}]
')
+ dev-qt/qtimageformats:5
dev-qt/qtcore:5=
dev-qt/qtdbus:5=
dev-qt/qtgui:5=[jpeg]
@@ -132,15 +133,6 @@ PATCHES=(
# We don't (yet?) package libjxr and it seems to be dead upstream
# (last commit in 2017)
"${FILESDIR}/${PN}-5.35.0-jxr-test.patch"
-
- # TODO:
- # test_qt tries to load a bunch of images using Qt and it currently
fails
- # due to some presumably missing dependencies. This is important and
- # we need to look into it, but at time of writing, none of the tests
- # are even bring run, so I'd like to return to this later.
- # We don't want to skip test_qt entirely, so just skip this particular
- # assert for now.
- "${FILESDIR}/${PN}-5.31.0-qt-image-test.patch"
)
src_prepare() {
@@ -193,8 +185,6 @@ src_compile() {
src_test() {
# Skipped tests:
- # Note that we currently have a hack to skip one part of test_qt!
- # See PATCHES for more.
local _test_excludes=(
# unpackaged Python dependency: py7zr
7z
