diff options
Diffstat (limited to 'www-client/qutebrowser/qutebrowser-9999.ebuild')
| -rw-r--r-- | www-client/qutebrowser/qutebrowser-9999.ebuild | 136 |
1 files changed, 90 insertions, 46 deletions
diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 9721e0227ee9..c5e8c1d91fae 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -1,46 +1,56 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 DISTUTILS_SINGLE_IMPL=1 DISTUTILS_USE_PEP517=setuptools -PYTHON_COMPAT=( python3_{8..11} ) -inherit distutils-r1 optfeature xdg +PYTHON_COMPAT=( python3_{10..12} ) +inherit distutils-r1 xdg if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git" else - SRC_URI="https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + inherit verify-sig + SRC_URI=" + https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz + verify-sig? ( https://github.com/qutebrowser/qutebrowser/releases/download/v${PV}/${P}.tar.gz.asc ) + " + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/qutebrowser.gpg + KEYWORDS="~amd64 ~arm64" fi -DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine" -HOMEPAGE="https://www.qutebrowser.org/" +DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt" +HOMEPAGE="https://qutebrowser.org/" LICENSE="GPL-3+" SLOT="0" -IUSE="+adblock widevine" +IUSE="+adblock pdf widevine" +# TODO: keep an eye on fixes for pdfjs-4.1, may potentially be solved by +# newer qtwebengine, qutebrowser upstream workarounds, pdfjs changes, or +# if our pdfjs ebuild ever switch to the legacy sdist RDEPEND=" - dev-qt/qtcore:5[icu] - dev-qt/qtgui:5[png] - $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' 3.8) $(python_gen_cond_dep ' + dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets] + dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] dev-python/colorama[${PYTHON_USEDEP}] - >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}] - >=dev-python/markupsafe-2.0.1[${PYTHON_USEDEP}] + dev-python/jinja[${PYTHON_USEDEP}] + dev-python/markupsafe[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] - dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,multimedia,gui,network,opengl,printsupport,sql,widgets] - dev-python/PyQtWebEngine[${PYTHON_USEDEP}] - dev-python/pyyaml[${PYTHON_USEDEP},libyaml(+)] + dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/zipp[${PYTHON_USEDEP}] - adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )') - widevine? ( www-plugins/chrome-binary-plugins )" + dev-qt/qtbase:6[icu,sqlite] + adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) + pdf? ( <www-plugins/pdfjs-4.1 ) + widevine? ( www-plugins/chrome-binary-plugins ) + ') +" BDEPEND=" $(python_gen_cond_dep ' test? ( + dev-python/PyQt6[testlib] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/cheroot[${PYTHON_USEDEP}] dev-python/flask[${PYTHON_USEDEP}] @@ -51,56 +61,86 @@ BDEPEND=" dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] dev-python/pytest-xvfb[${PYTHON_USEDEP}] dev-python/tldextract[${PYTHON_USEDEP}] - )')" -[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc" + ) + ') +" + +if [[ ${PV} == 9999 ]]; then + BDEPEND+=" app-text/asciidoc" +else + BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-qutebrowser )" +fi distutils_enable_tests pytest src_prepare() { distutils-r1_src_prepare - if use widevine; then - local widevine=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so - sed "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${widevine}'" \ - -i ${PN}/config/qtargs.py || die + if use pdf; then + # does not hurt to enable by default if it was explicitly requested + sed -e '/^content.pdfjs:/,+1s/false/true/' \ + -i ${PN}/config/configdata.yml || die fi # let eclass handle python sed -i '/setup.py/d' misc/Makefile || die - [[ ${PV} != 9999 ]] || ${EPYTHON} scripts/asciidoc2html.py || die + if [[ ${PV} == 9999 ]]; then + # call asciidoc(1) rather than the single target python module + sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \ + -i scripts/asciidoc2html.py || die - # these plugins/tests are unnecessary here and have extra dependencies - sed -e '/pytest-benchmark/d;s/--benchmark[^ ]*//' \ - -e '/pytest-instafail/d;s/--instafail//' \ - -i pytest.ini || die - [[ ${PV} == 9999 ]] || rm tests/unit/scripts/test_problemmatchers.py || die - [[ ${PV} != 9999 ]] || rm tests/unit/scripts/test_run_vulture.py || die + "${EPYTHON}" scripts/asciidoc2html.py || die + fi + + if use test; then + # unnecessary here, and would require extra deps + sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \ + -e '/pytest-instafail/d' -e 's/--instafail//' \ + -i pytest.ini || die + + if [[ ${PV} == 9999 ]]; then + # likewise, needs vulture + rm tests/unit/scripts/test_run_vulture.py || die + else + # https://github.com/qutebrowser/qutebrowser/issues/7620 + rm tests/unit/scripts/test_problemmatchers.py || die + fi + fi } python_test() { - local -x PYTEST_QT_API=pyqt5 + local -x PYTEST_QT_API=pyqt6 local EPYTEST_DESELECT=( - # end2end and other IPC tests are broken with "Name error" if - # socket path is over 104 characters (=124 in /var/tmp/portage) - # https://github.com/qutebrowser/qutebrowser/issues/888 (not just OSX) + # end2end/IPC tests are broken with "Name error" if socket path is over + # ~108 characters (>124 in /var/tmp/portage) due to Linux limitations, + # skip rather than bother using /tmp+cleanup over ${T} (end2end tests + # are important, but the other tests should be enough for downstream) tests/end2end tests/unit/misc/test_ipc.py - # tests that don't know about our newer qtwebengine - tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround - tests/unit/utils/test_version.py::TestChromiumVersion - # may misbehave depending on installed old python versions + # python eclasses provide a fake "failing" python2 and trips this test tests/unit/misc/test_checkpyver.py::test_old_python - # bug 819393 - tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner] # not worth running dbus over tests/unit/browser/test_notification.py::TestDBus + # fails in ebuild, seems due to saving fake downloads in the wrong location + tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround + # may fail if environment is very large (bug #819393) + tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\] + # fails if chromium version is unrecognized (aka newer qtwebengine) + tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version + ) + + local epytestargs=( + # prefer pytest-xvfb over virtx given same upstream and is expected + -p xvfb + # skip warning tests broken by -Wdefault, and benchmarks + -k 'not _bench and not _matches_tree and not _warning' + # override eclass' settings, tempdirs are re-used by Qt + -o tmp_path_retention_policy=all ) - use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py ) - # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault - epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning' + epytest "${epytestargs[@]}" } python_install_all() { @@ -116,11 +156,15 @@ python_install_all() { pkg_postinst() { xdg_pkg_postinst - optfeature "PDF display support" www-plugins/pdfjs - if [[ ! ${REPLACING_VERSIONS} ]]; then elog "Note that optional scripts in ${EROOT}/usr/share/${PN}/{user,}scripts" elog "have additional dependencies not covered by this ebuild, for example" elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp." fi + + if has_version 'dev-qt/qtwebengine:6[bindist]'; then + ewarn + ewarn "USE=bindist is set on dev-qt/qtwebengine, be warned that this" + ewarn "will prevent playback of proprietary media formats (e.g. h264)." + fi } |