diff options
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/Manifest.gz | bin | 6211 -> 6212 bytes | |||
| -rw-r--r-- | www-client/qutebrowser/Manifest | 7 | ||||
| -rw-r--r-- | www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild | 3 | ||||
| -rw-r--r-- | www-client/qutebrowser/qutebrowser-3.5.0-r1.ebuild | 172 | ||||
| -rw-r--r-- | www-client/qutebrowser/qutebrowser-9999.ebuild | 7 |
5 files changed, 178 insertions, 11 deletions
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz Binary files differindex 035a1286eb81..9772da80f49e 100644 --- a/www-client/Manifest.gz +++ b/www-client/Manifest.gz diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest index 7bfa5f81f1cb..48a742c36606 100644 --- a/www-client/qutebrowser/Manifest +++ b/www-client/qutebrowser/Manifest @@ -1,5 +1,8 @@ DIST qutebrowser-3.4.0.tar.gz 6065180 BLAKE2B fb4b8c7207b9320ce185465f249cdfa430330935cac40ae02d41e583d7f41da4deb2ac24489cf8c76473468706c8d812eceb7b24c4a430767b758615703b7e57 SHA512 9f056012e53a75c06cf2a6f113dd9ce53d1052250c4fdaa969586b182ec1b36ed077b1a140f10c779e8ae5eb0df69b7d3d466bbf14a21c433a84c9d621f53f96 DIST qutebrowser-3.4.0.tar.gz.asc 659 BLAKE2B 4e9438d9b3b33e2fc61dca1e264cf83b09e77cdb6fcaebe779347097ab4be064f2c1cd18cb59e23e959dc65da94cca578da2adc909c6f0e05b6e6304db25b23b SHA512 6fe8276f2873334dc433c7eeef96c36158a301b53a7bd3f0e670ec539e6c41d47c7c3d4979e590627fb9bf5656ce568bfb1231cab6485e7ca0d761b063b747d7 -EBUILD qutebrowser-3.4.0-r1.ebuild 5731 BLAKE2B 1a8ad06fa47ce274f4a28280b14661683e0f635807c17154aa7c1880ce7f2c665995df50197fbd48908db10f27542e6070fa244801a216e7ea9b04da85656956 SHA512 eb502a91f6b4d5058869030a38b35a5bc3ea0dbfe6fca088c5eba2aa7fcf04fdb0b37736e9355d2df15e7c64a180ddd003ad9d87ef8e806e8b7c066dd973695e -EBUILD qutebrowser-9999.ebuild 5876 BLAKE2B a68ead3bf98ba3a49ac54a7774f5e3a0da4bcf1853aa67ab1416ccd72762349dd3d15a2dc34bb60f59bc629b3fab23a2451ecf791adb719346df8fcf51cf9972 SHA512 d2b2d27b96e0346f7bfc0e7f6f42afc005fa1749cd0d73a49c36c6a72afd30b37f630a61f4bec869299f8db879d88ec94641bfaa6ebb936ac4cd9da0202f2fee +DIST qutebrowser-3.5.0.tar.gz 6071383 BLAKE2B a495028e4ce764f1097b690f262d915aceb89faba585b26987364ece5687a6ca26a9c456140515e1898c897a9ebb5eb108de4a9c61fcca54e2ee5a0e1130cc78 SHA512 cae51679b059937332dc66ade6e75f108df6b39c30e8b085dba5e2b5ad5b1389d1f416273bee8b1b936b9fc51654a7626fb29a12ef9706ef5ee11209b16ad7c2 +DIST qutebrowser-3.5.0.tar.gz.asc 659 BLAKE2B 9c304a96ec29cbb60295934fdb2fb091ab13774b65f707ab94fb65071dfa224f134546c8027a681fb99fd5f1bcc93481739d231d55151834ff30146ebe4a9b8c SHA512 61e4ac6b513d14e742992bcc1d16f587c47e9d9e877ccf592cfdfeff4396d8e751b56053c6e05ab55bfc02fe3a352720cbdec6fe62f1d39a4da2c63efd1843c8 +EBUILD qutebrowser-3.4.0-r1.ebuild 5561 BLAKE2B e611206568159081630c6a2cc36c80951ea0afc766646b1aa4a5b882a7cc002c64f6bd6731b13d5f8f72fa8bff5a75b4b030df572eb271c06d4840ee69da1422 SHA512 867caa8adc9a4047e0c0daf60deb4bb61e03edd5d2a7f0140d39de2824e5653eb25ecf014d4e587528067f324a2d1faa1f50e6dee8172c17f1acf5c86ee3cc57 +EBUILD qutebrowser-3.5.0-r1.ebuild 5559 BLAKE2B 1bfc04637515540c9981dec122ac36555595a8a3609c6d52f2df45170c43396327ec322e710c4dc56efc6cbd4705757988aa80e24041645bfd56f76f7e4bf80c SHA512 633feb8758133d5863747146687dfad8e767f4d3fa8050b220a62d8523798f849107a27475afc275bd0dd796003a8c86f9f86f1777e63bc514ec4adfb65a18cf +EBUILD qutebrowser-9999.ebuild 5559 BLAKE2B 1bfc04637515540c9981dec122ac36555595a8a3609c6d52f2df45170c43396327ec322e710c4dc56efc6cbd4705757988aa80e24041645bfd56f76f7e4bf80c SHA512 633feb8758133d5863747146687dfad8e767f4d3fa8050b220a62d8523798f849107a27475afc275bd0dd796003a8c86f9f86f1777e63bc514ec4adfb65a18cf MISC metadata.xml 945 BLAKE2B e796d777d56a5452b6652d77e011dfb160684f6e7498d0c4fad583bb828ecd111c25be5d80ed906b9b579e6ccd33315fc20a727342df0fb1b66b1a71effcea25 SHA512 80a65a391a84208042d9e7a6e0b5e8644ed07d5e389cd6a7b314b961dca5cff6406c5556693b34dcd275acfb27d05d9e40f77e9d503f9e3e8054ab6b6763932d diff --git a/www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild b/www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild index eabfd40f5f79..becd4de83c17 100644 --- a/www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild +++ b/www-client/qutebrowser/qutebrowser-3.4.0-r1.ebuild @@ -44,12 +44,9 @@ RDEPEND=" widevine? ( www-plugins/chrome-binary-plugins ) ') " -# TODO: drop gherkin-official dep entirely when >=31 is fixed (not looked -# into yet), should normally be pulled by pytest-bdd instead BDEPEND=" $(python_gen_cond_dep ' test? ( - <dev-python/gherkin-official-31 dev-python/pyqt6[testlib] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/cheroot[${PYTHON_USEDEP}] diff --git a/www-client/qutebrowser/qutebrowser-3.5.0-r1.ebuild b/www-client/qutebrowser/qutebrowser-3.5.0-r1.ebuild new file mode 100644 index 000000000000..4f7611484fc5 --- /dev/null +++ b/www-client/qutebrowser/qutebrowser-3.5.0-r1.ebuild @@ -0,0 +1,172 @@ +# Copyright 1999-2025 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_{10..13} ) +inherit distutils-r1 xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/qutebrowser/qutebrowser.git" +else + 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 Python and Qt" +HOMEPAGE="https://qutebrowser.org/" + +LICENSE="GPL-3+" +SLOT="0" +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/jinja2[${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}] ) + 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}] + dev-python/hypothesis[${PYTHON_USEDEP}] + dev-python/pillow[${PYTHON_USEDEP}] + dev-python/pytest-bdd[${PYTHON_USEDEP}] + dev-python/pytest-mock[${PYTHON_USEDEP}] + dev-python/pytest-qt[${PYTHON_USEDEP}] + dev-python/pytest-rerunfailures[${PYTHON_USEDEP}] + dev-python/pytest-xvfb[${PYTHON_USEDEP}] + dev-python/tldextract[${PYTHON_USEDEP}] + ) + ') +" + +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 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 + + if [[ ${PV} == 9999 ]]; then + # call asciidoc(1) rather than the single target python module + sed -e '/cmdline = /s/= .*/= ["asciidoc"]/' \ + -i scripts/asciidoc2html.py || die + + "${EPYTHON}" scripts/asciidoc2html.py || die + fi + + if use test; then + # skip unnecessary (for us) pytest plugins, and ignore Qt's + # warnings that tend to newly appear with new versions + sed -e '/pytest-benchmark/d' -e 's/--benchmark[^ ]*//' \ + -e '/pytest-instafail/d' -e 's/--instafail//' \ + -e '/qt_log_level_fail/s/WARNING/CRITICAL/' \ + -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=pyqt6 + + local EPYTEST_DESELECT=( + # 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 + # python eclasses provide a fake "failing" python2 and trips this test + tests/unit/misc/test_checkpyver.py::test_old_python + # 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\] + # may fail if chromium version is unrecognized (aka newer qtwebengine) + tests/unit/utils/test_version.py + # no longer XFAIL due to being fixed in python + tests/unit/utils/test_urlmatch.py::test_invalid_patterns\[host-ipv6-two-closing\] + ) + + 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 + ) + + epytest "${epytestargs[@]}" +} + +python_install_all() { + emake -f misc/Makefile DESTDIR="${D}" PREFIX="${EPREFIX}"/usr install + + rm -- "${ED}"/usr/share/${PN}/scripts/{mkvenv,utils}.py || die + fperms -x /usr/share/${PN}/{scripts/cycle-inputs.js,userscripts/README.md} + python_fix_shebang "${ED}"/usr/share/${PN} + + einstalldocs +} + +pkg_postinst() { + xdg_pkg_postinst + + 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 +} diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 154cb9abbd97..4f7611484fc5 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -28,8 +28,6 @@ LICENSE="GPL-3+" SLOT="0" IUSE="+adblock pdf widevine" -# TODO: check if pdfjs-5 works again with qtwebengine-6.9.x, or try the -# (unpackaged) legacy edition of pdfjs-5 meant for old chromium compat. RDEPEND=" $(python_gen_cond_dep ' dev-python/pyqt6-webengine[${PYTHON_USEDEP},widgets] @@ -42,16 +40,13 @@ RDEPEND=" dev-python/zipp[${PYTHON_USEDEP}] dev-qt/qtbase:6[icu,sqlite] adblock? ( dev-python/adblock[${PYTHON_USEDEP}] ) - pdf? ( <www-plugins/pdfjs-5 ) + pdf? ( www-plugins/pdfjs ) widevine? ( www-plugins/chrome-binary-plugins ) ') " -# TODO: drop gherkin-official dep entirely when >=31 is fixed (not looked -# into yet), should normally be pulled by pytest-bdd instead BDEPEND=" $(python_gen_cond_dep ' test? ( - <dev-python/gherkin-official-31 dev-python/pyqt6[testlib] dev-python/beautifulsoup4[${PYTHON_USEDEP}] dev-python/cheroot[${PYTHON_USEDEP}] |