commit: b4de57077200b5c9bbddf981b82aeb276f10d0aa Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Wed Mar 27 10:43:20 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Wed Mar 27 11:01:08 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4de5707
www-client/qutebrowser: force-enable Qt6 in live Still supported upstream, but qtwebengine:5 is slowly on its way out in Gentoo and offers a poor browsing experience with modern websites. Some may prefer Qt5 for better DE integration at the moment, but considering that these issues throne over that. Also drop the transition warning, we can rely on the warning that qutebrowser itself will do (formerly was missing, thus the ebuild warning was more useful). Plus given there is no USE to disable Qt6 anymore going back the other way is unlikely. Qutebrowser's default is Qt6 so we can also drop the overrides. Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> www-client/qutebrowser/qutebrowser-9999.ebuild | 63 ++++---------------------- 1 file changed, 8 insertions(+), 55 deletions(-) diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 0ee9fb6c0be8..63c251546529 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -26,37 +26,28 @@ HOMEPAGE="https://qutebrowser.org/"; LICENSE="GPL-3+" SLOT="0" -IUSE="+adblock pdf +qt6 widevine" +IUSE="+adblock pdf widevine" RDEPEND=" $(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[${PYTHON_USEDEP}] dev-python/markupsafe[${PYTHON_USEDEP}] dev-python/pygments[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/zipp[${PYTHON_USEDEP}] + dev-qt/qtbase:6[icu,sqlite] adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) - qt6? ( - dev-qt/qtbase:6[icu,sqlite] - dev-python/PyQt6[${PYTHON_USEDEP},dbus,gui,network,opengl,printsupport,qml,sql,widgets] - dev-python/PyQt6-WebEngine[${PYTHON_USEDEP},widgets] - pdf? ( www-plugins/pdfjs ) - ) - !qt6? ( - dev-qt/qtcore:5[icu] - dev-qt/qtgui:5[png] - dev-qt/qtsql:5[sqlite] - dev-python/PyQt5[${PYTHON_USEDEP},dbus,declarative,gui,network,opengl,printsupport,sql,widgets] - dev-python/PyQtWebEngine[${PYTHON_USEDEP}] - pdf? ( <www-plugins/pdfjs-3 ) - ) + pdf? ( www-plugins/pdfjs ) 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}] @@ -67,8 +58,6 @@ BDEPEND=" dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] dev-python/pytest-xvfb[${PYTHON_USEDEP}] dev-python/tldextract[${PYTHON_USEDEP}] - qt6? ( dev-python/PyQt6[testlib] ) - !qt6? ( dev-python/PyQt5[testlib] ) ) ') " @@ -90,10 +79,6 @@ src_prepare() { -i ${PN}/config/configdata.yml || die fi - # ensure the requested backend is used in case multiple are available - sed -e "/^_WRAPPER_OVERRIDE =/s/None/\"PyQt$(usex qt6 6 5)\"/" \ - -i qutebrowser/qt/machinery.py || die - # let eclass handle python sed -i '/setup.py/d' misc/Makefile || die @@ -122,7 +107,7 @@ src_prepare() { } python_test() { - local -x PYTEST_QT_API=pyqt$(usex qt6 6 5) + local -x PYTEST_QT_API=pyqt6 local EPYTEST_DESELECT=( # end2end/IPC tests are broken with "Name error" if socket path is over @@ -139,19 +124,10 @@ python_test() { 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\] - # needs _WRAPPER_OVERRIDE = None, but we have changed it - tests/unit/test_qt_machinery.py::TestSelectWrapper::test_autoselect_by_default - tests/unit/test_qt_machinery.py::TestInit::test_none_available_{implicit,explicit} # fails if chromium version is unrecognized (aka newer qtwebengine) tests/unit/utils/test_version.py::TestWebEngineVersions::test_real_chromium_version ) - # tests known failing with Qt5 which is considered a 2nd class citizen - # and, unless completely broken, new tests issues may not be pursued - use qt6 || EPYTEST_DESELECT+=( - tests/unit/mainwindow/test_tabwidget.py::TestTabWidget::test_tab_text_not_edlided_for_wide_tabs - ) - local epytestargs=( # prefer pytest-xvfb over virtx given same upstream and is expected -p xvfb @@ -174,12 +150,6 @@ python_install_all() { einstalldocs } -pkg_preinst() { - xdg_pkg_preinst - - has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6= -} - pkg_postinst() { xdg_pkg_postinst @@ -189,24 +159,7 @@ pkg_postinst() { elog "view_in_mpv needs media-video/mpv[lua] and net-misc/yt-dlp." fi - if [[ ! -v QUTEBROWSER_HAD_QT6 && ${REPLACING_VERSIONS} ]] && use qt6; then - ewarn - ewarn "Be warned that starting the Qt6 version of ${PN} performs a one-way" - ewarn "conversion of ~/.local/share/${PN}/webengine to Qt6. There will also" - ewarn "be a warning on startup, and may optionally want to backup first." - fi - - # only show Qt6 warning on arches where USE=qt6 is unmasked - if use amd64 && use !qt6; then - ewarn - ewarn "USE=qt6 is disabled, be warned that Qt5's WebEngine uses an older" - ewarn "chromium version. While it is relatively maintained for security, it will" - ewarn "cause issues for sites/features designed with a newer version in mind." - fi - - if { use qt6 && has_version 'dev-qt/qtwebengine:6[bindist]'; } || - { use !qt6 && has_version 'dev-qt/qtwebengine:5[bindist]'; } - then + 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)."
