* [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
@ 2020-05-27 16:19 Stefan Strogin
0 siblings, 0 replies; 6+ messages in thread
From: Stefan Strogin @ 2020-05-27 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 1ea73a813f311897ff6ed9fe4bdceaf36bb24213
Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Wed May 27 16:13:16 2020 +0000
Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Wed May 27 16:17:25 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea73a81
www-client/qutebrowser: add patch to fix session breakage with Qt 5.15
See also: https://github.com/qutebrowser/qutebrowser/issues/5359
Package-Manager: Portage-2.3.100, Repoman-2.3.22
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
.../files/qutebrowser-1.11.1-session-restore.patch | 45 ++++++++++++++++++++++
...-1.11.1.ebuild => qutebrowser-1.11.1-r1.ebuild} | 2 +
2 files changed, 47 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch b/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch
new file mode 100644
index 00000000000..060c94eee6b
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch
@@ -0,0 +1,45 @@
+From 22e15acc1e617174a9fde3e53100a1b71ca7f462 Mon Sep 17 00:00:00 2001
+From: Florian Bruhin <me@the-compiler.org>
+Date: Tue, 26 May 2020 16:48:00 +0200
+Subject: [PATCH] Update Qt 5.15 session workaround for lazy_restore
+
+See #5359
+
+(cherry picked from commit 093a454bf4e386eda8715bc3ea2b217760d5f070)
+Upstream-Status: Accepted
+[https://github.com/qutebrowser/qutebrowser/commit/093a454bf4e386eda8715bc3ea2b217760d5f070
+expected in v1.12.0]
+---
+ qutebrowser/browser/webengine/webenginetab.py | 6 +++++-
+ qutebrowser/html/warning-sessions.html | 1 +
+ 2 files changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/qutebrowser/browser/webengine/webenginetab.py b/qutebrowser/browser/webengine/webenginetab.py
+index 647fa60abc..f61404f4ea 100644
+--- a/qutebrowser/browser/webengine/webenginetab.py
++++ b/qutebrowser/browser/webengine/webenginetab.py
+@@ -648,7 +648,11 @@ def load_items(self, items):
+ if qtutils.version_check('5.15', compiled=False):
+ # WORKAROUND for https://github.com/qutebrowser/qutebrowser/issues/5359
+ if items:
+- self._tab.load_url(items[-1].url)
++ url = items[-1].url
++ if ((url.scheme(), url.host()) == ('qute', 'back') and
++ len(items) >= 2):
++ url = items[-2].url
++ self._tab.load_url(url)
+ return
+
+ if items:
+diff --git a/qutebrowser/html/warning-sessions.html b/qutebrowser/html/warning-sessions.html
+index f93971c6ab..dd0c4127b6 100644
+--- a/qutebrowser/html/warning-sessions.html
++++ b/qutebrowser/html/warning-sessions.html
+@@ -15,6 +15,7 @@ <h1>{{ title }}</h1>
+
+ <ul>
+ <li>Loading a session with this release will <b>only load the most recently opened page</b> for every tab. As a result, the back/forward-history of every tab <b>will be lost</b> as soon as the session is saved again.</li>
++ <li>Due to that, the <span class="mono">session.lazy_restore</span> setting does not have any effect.</li>
+ <li>A one-time backup of the session folder has been created at <span class="mono">{{ datadir }}{{ sep }}sessions{{ sep }}before-qt-515</span>.</li>
+ </ul>
+
diff --git a/www-client/qutebrowser/qutebrowser-1.11.1.ebuild b/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild
similarity index 97%
rename from www-client/qutebrowser/qutebrowser-1.11.1.ebuild
rename to www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild
index aa75aa62045..2cfc68ac7db 100644
--- a/www-client/qutebrowser/qutebrowser-1.11.1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild
@@ -38,6 +38,8 @@ distutils_enable_tests setup.py
# isn't complete and X11 is required in order to start up qutebrowser.
RESTRICT="test"
+PATCHES=( "${FILESDIR}"/${P}-session-restore.patch )
+
python_compile_all() {
a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
@ 2021-12-02 5:13 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2021-12-02 5:13 UTC (permalink / raw
To: gentoo-commits
commit: 2a532e1e3f186c98d72f80ae8a2088ee60db9484
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 2 04:51:35 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Thu Dec 2 05:10:27 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2a532e1e
www-client/qutebrowser: drop 2.3.1-r2
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
www-client/qutebrowser/Manifest | 1 -
.../files/qutebrowser-2.3.1-pyyaml60.patch | 19 ---
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild | 128 ---------------------
3 files changed, 148 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index f42c7956d26e..95272ae21135 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1 @@
-DIST qutebrowser-2.3.1.tar.gz 6244845 BLAKE2B 55dff9141e65f3e65701027e81106bc7b5ebe98d982111055d3b18ae91470603848107139845b1af248bb98074e39a2e7ceb9ab3e1bf523a52c81aaddda4f211 SHA512 1798e4659a8e53f53df6fe0307d6cfaf4641fda1b68facec90d825c0fa04ffa32867d51e45c92cd57ebbb4240085592dc8cd9fc120abea9803b2c1aab7205239
DIST qutebrowser-2.4.0.tar.gz 6074001 BLAKE2B 9eda4a72b9050d6992681803b69778d954654fffd78aa524dfba9bddcbb8e54bd84e6725c30d826dddeb45b6b76e06d7401c7ad22d15a153b4cc1104e791cc84 SHA512 e4341a57a259a31e1c665eec34329594bb3d8390e3c612a15c1857ff12cb9e1f5b30954dd0cd91bee0a40ec0d97c59349ab7cd699626434a89c7d40e5dd961f7
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
deleted file mode 100644
index d585109b9f2c..000000000000
--- a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-https://github.com/qutebrowser/qutebrowser/commit/1547a48
-From: Florian Bruhin <me@the-compiler.org>
-Date: Thu, 14 Oct 2021 09:05:07 +0200
-Subject: [PATCH] tests: Adjust for PyYAML 6.0
---- a/tests/unit/utils/test_utils.py
-+++ b/tests/unit/utils/test_utils.py
-@@ -809,8 +809,11 @@ def test_load(self):
- assert utils.yaml_load("[1, 2]") == [1, 2]
-
- def test_load_float_bug(self):
-- with pytest.raises(yaml.YAMLError):
-+ try:
- utils.yaml_load("._")
-+ except yaml.YAMLError:
-+ # Either no exception or YAMLError, not ValueError
-+ pass
-
- def test_load_file(self, tmp_path):
- tmpfile = tmp_path / 'foo.yml'
diff --git a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
deleted file mode 100644
index bfc54af8e690..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..10} )
-inherit distutils-r1 optfeature 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"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock widevine"
-
-RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep 'dev-python/importlib_resources[${PYTHON_USEDEP}]' python3_8)
- $(python_gen_cond_dep '
- >=dev-python/colorama-0.4.4[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.1[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${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-5.4.1[${PYTHON_USEDEP},libyaml(+)]
- dev-python/typing-extensions[${PYTHON_USEDEP}]
- dev-python/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )
- ')
- widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
- app-text/asciidoc
- $(python_gen_cond_dep '
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/cheroot[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/hypothesis[${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}]
- )
- ')"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-pyyaml60.patch
-)
-
-python_prepare_all() {
- distutils-r1_python_prepare_all
-
- if use widevine; then
- sed "/yield from _qtwebengine_settings_args/a\ yield '--widevine-path=${EPREFIX}/usr/$(get_libdir)/chromium-browser/WidevineCdm/_platform_specific/linux_x64/libwidevinecdm.so'" \
- -i ${PN}/config/qtargs.py || die
- fi
-
- sed -i '/setup.py/d' misc/Makefile || die
-
- [[ ${PV} != 9999 ]] || ${EPYTHON} 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
-}
-
-python_test() {
- 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)
- 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
- # needs qtwebkit and isn't skipped by default
- tests/unit/config/test_websettings.py::test_config_init
- # may misbehave depending on installed old python versions
- tests/unit/misc/test_checkpyver.py::test_old_python
- # bug 819393
- tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner]
- )
- use widevine && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )
-
- # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -k 'not _bench and not _matches_tree and not _warning'
-}
-
-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
-
- 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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
@ 2022-12-11 18:14 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2022-12-11 18:14 UTC (permalink / raw
To: gentoo-commits
commit: 9c374f2d54c4bd5730da0c38f32a879fb92a3b24
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 18:11:39 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 18:14:06 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c374f2d
www-client/qutebrowser: backport trivial dictcli.py fix
Not super important, but still be a while before a 3.0.0,
and unsure when/if 2.5.3 is happening.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../qutebrowser/files/qutebrowser-2.5.2-dictcli.patch | 17 +++++++++++++++++
...browser-2.5.2.ebuild => qutebrowser-2.5.2-r1.ebuild} | 4 ++++
2 files changed, 21 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
new file mode 100644
index 000000000000..cd179a5d0236
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
@@ -0,0 +1,17 @@
+https://github.com/qutebrowser/qutebrowser/commit/f277876ce0817f7d05ca94b05beb644482027f85
+From: Florian Bruhin <me@the-compiler.org>
+Date: Sat, 19 Nov 2022 16:00:15 +0100
+Subject: [PATCH] dictcli: Switch from master to main
+
+Fixes #7481
+--- a/scripts/dictcli.py
++++ b/scripts/dictcli.py
+@@ -40,7 +40,7 @@
+ from qutebrowser.utils import standarddir
+
+
+-API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/master/'
++API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/main/'
+
+
+ class InvalidLanguageError(Exception):
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
similarity index 98%
rename from www-client/qutebrowser/qutebrowser-2.5.2.ebuild
rename to www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
index d3151e4cf8de..459d498416d1 100644
--- a/www-client/qutebrowser/qutebrowser-2.5.2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
@@ -57,6 +57,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-dictcli.patch
+)
+
src_prepare() {
distutils-r1_src_prepare
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
@ 2023-03-18 23:22 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2023-03-18 23:22 UTC (permalink / raw
To: gentoo-commits
commit: c74ded47caf44e1655e62f23dcc223a5b7541496
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 16 22:19:46 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sat Mar 18 23:22:12 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c74ded47
www-client/qutebrowser: drop 2.5.2-r1
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
www-client/qutebrowser/Manifest | 1 -
.../files/qutebrowser-2.5.2-dictcli.patch | 17 ---
www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild | 133 ---------------------
3 files changed, 151 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index ec0594f9451b..7644b9878438 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,2 +1 @@
-DIST qutebrowser-2.5.2.tar.gz 6114611 BLAKE2B 5f56e1e2c390bb2f36c95e25a2dae9e5203020ff6b2cf1e13092cf493efa950b24b8ff8f23af6eed93ca8b316e30f86715ecd2f2eb28c341210de0b25c9f67ad SHA512 4751ea1a5b1776f085fcd1f9ab5ff805155fca34d0272ba8eb6574f9074257929c3fb5b50c9053a522bfb346aee1a2551b58cf933c6ff7c5c84fd10559ec36fc
DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3 SHA512 1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
diff --git a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch b/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
deleted file mode 100644
index cd179a5d0236..000000000000
--- a/www-client/qutebrowser/files/qutebrowser-2.5.2-dictcli.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-https://github.com/qutebrowser/qutebrowser/commit/f277876ce0817f7d05ca94b05beb644482027f85
-From: Florian Bruhin <me@the-compiler.org>
-Date: Sat, 19 Nov 2022 16:00:15 +0100
-Subject: [PATCH] dictcli: Switch from master to main
-
-Fixes #7481
---- a/scripts/dictcli.py
-+++ b/scripts/dictcli.py
-@@ -40,7 +40,7 @@
- from qutebrowser.utils import standarddir
-
-
--API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/master/'
-+API_URL = 'https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git/+/main/'
-
-
- class InvalidLanguageError(Exception):
diff --git a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild b/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
deleted file mode 100644
index 1e0b94274b51..000000000000
--- a/www-client/qutebrowser/qutebrowser-2.5.2-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2023 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_{9..11} )
-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"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf widevine"
-
-RDEPEND="
- dev-qt/qtcore:5[icu]
- dev-qt/qtgui:5[png]
- $(python_gen_cond_dep '
- dev-python/colorama[${PYTHON_USEDEP}]
- >=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
- >=dev-python/markupsafe-2.0.1[${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/zipp[${PYTHON_USEDEP}]
- adblock? ( dev-python/adblock[${PYTHON_USEDEP}] )')
- pdf? ( <www-plugins/pdfjs-3 )
- widevine? ( www-plugins/chrome-binary-plugins )"
-BDEPEND="
- $(python_gen_cond_dep '
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/cheroot[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/hypothesis[${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}]
- )')"
-[[ ${PV} != 9999 ]] || BDEPEND+=" app-text/asciidoc"
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-dictcli.patch
-)
-
-src_prepare() {
- distutils-r1_src_prepare
-
- if use pdf; then
- sed '/^content.pdfjs:/,+1s/false/true/' \
- -i ${PN}/config/configdata.yml || die
- fi
-
- 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
- fi
-
- # let eclass handle python
- sed -i '/setup.py/d' misc/Makefile || die
-
- [[ ${PV} != 9999 ]] || ${EPYTHON} 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
-}
-
-python_test() {
- local -x PYTEST_QT_API=pyqt5
-
- 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)
- 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
- 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
- )
- 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'
-}
-
-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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
@ 2023-09-17 1:59 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2023-09-17 1:59 UTC (permalink / raw
To: gentoo-commits
commit: f45b72a5c98aef514d1565b2b59f4d1645f3231f
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 16 07:40:46 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Sun Sep 17 01:54:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f45b72a5
www-client/qutebrowser: ignore new Qt warnings for tests
Maybe bit early to do this, but currently getting these
warnings with due-for-release-soon 6.5.3 and 6.6.0 branches.
Temporary either way, that's something upstream will handle
if still needed by the time of next release.
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
.../qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch | 10 ++++++++++
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 4 ++++
2 files changed, 14 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
new file mode 100644
index 000000000000..e6d1185202cd
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
@@ -0,0 +1,10 @@
+Qt6.5.3+ emits new warnings and causes tests to be aborted even if did
+not really fail. May(?) indicate that something needs to be done better
+in PyQt6 or qutebrowser, but let's just ignore it here for now.
+--- a/pytest.ini
++++ b/pytest.ini
+@@ -61,2 +61,4 @@
+ ^QBackingStore::endPaint\(\) called with active painter; did you forget to destroy it or call QPainter::end\(\) on it\?$
++ # ...and Qt 6.5.3
++ ^QItemSelectionModel: Selecting when no model has been set will result in a no-op\.
+ xfail_strict = true
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
index 917250eb0675..0b5e8e7dd8d5 100644
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
@@ -81,6 +81,10 @@ fi
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-tests-qt653.patch
+)
+
src_prepare() {
distutils-r1_src_prepare
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/
@ 2023-11-27 8:47 Ionen Wolkens
0 siblings, 0 replies; 6+ messages in thread
From: Ionen Wolkens @ 2023-11-27 8:47 UTC (permalink / raw
To: gentoo-commits
commit: 5f803d5c4c05646ee9fd9c11bd3813542b22b3a7
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 27 08:11:55 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Nov 27 08:45:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5f803d5c
www-client/qutebrowser: drop 3.0.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
www-client/qutebrowser/Manifest | 2 -
.../files/qutebrowser-3.0.0-tests-qt653.patch | 12 --
www-client/qutebrowser/qutebrowser-3.0.0.ebuild | 202 ---------------------
3 files changed, 216 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 6f44a498049f..812ce75e59b1 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,2 @@
-DIST qutebrowser-3.0.0.tar.gz 6030459 BLAKE2B 05e1f3c87fe572ec66d199b9c255178c7e7358321c44255b9191624fa4fede0525b16ff0740df5051390f4e3b2a2c3ee99d53fcf6c44279689f9ea0427df13ca SHA512 2aa361b418adad1e2c2dd068148215f3eaea29c70e00634fd1a2370d584ffa2a66b0a0e22623656fc5f634d35ba99a178c269a3accd25edf778b7e3077ceb373
-DIST qutebrowser-3.0.0.tar.gz.asc 659 BLAKE2B 19d736ede7cfb2ac4d3ebaea7f4f8a6da722e3eac0c1693d487ed16f2bc5a5cce13bbc69604cd7c34e266c345f3149f2f2250aba71555f3290cd63216adc0b98 SHA512 25c9cd3fa44f712b98ef3f8d1821f61d5f2b96d8bf108ff2277dc6609343237876124f7587cf906127b8d6161923bda0946c6ef75f3cbf6c401cf5d72b7a6ffd
DIST qutebrowser-3.0.2.tar.gz 6036377 BLAKE2B e7e20eacae745fb6a2c30e16667f1db55dc744d63cc20d287d563b1a69741797a2d473c8a450a93bae700db6798f9dd7549c3bec5497ffc67679d8f63e82d5fb SHA512 fb980d3d55bb6f6ecdb79f3d38e616399828c647b9fbf16c791e8964ba3e6f350ffced0944bbec60b60a2451c60e383ecdd93e535f41292d2dc2b75830049a66
DIST qutebrowser-3.0.2.tar.gz.asc 659 BLAKE2B ed789a18a5221143632f0abcc112526910952eccfd01c01cc418ef2175b2ca42b1ae7b0a21ac4194789b0ce5713628b328dc36a5328e3e01084672839fcef184 SHA512 b01276f073498f9ef982706b1b8048db22e3fa017d99b9ebe2f4f75615a12c5614ea2b047577632e558e4f3c860fa9a84429a47f0dfa75a287b24fb86a8af950
diff --git a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch b/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
deleted file mode 100644
index 107a50f2b07a..000000000000
--- a/www-client/qutebrowser/files/qutebrowser-3.0.0-tests-qt653.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Qt6.5.3(?)+6.6.0-rc emits new warnings and causes tests to be
-aborted even if did not really fail. Should be fixed[1] in 6.6.0
-final and cleanable later.
-
-[1] https://bugreports.qt.io/browse/QTBUG-117200
---- a/pytest.ini
-+++ b/pytest.ini
-@@ -61,2 +61,4 @@
- ^QBackingStore::endPaint\(\) called with active painter; did you forget to destroy it or call QPainter::end\(\) on it\?$
-+ # ...and Qt 6.5.3+
-+ ^QItemSelectionModel: Selecting when no model has been set will result in a no-op\.
- xfail_strict = true
diff --git a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild b/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
deleted file mode 100644
index 879050450943..000000000000
--- a/www-client/qutebrowser/qutebrowser-3.0.0.ebuild
+++ /dev/null
@@ -1,202 +0,0 @@
-# Copyright 1999-2023 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..12} )
-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 ~x86"
-fi
-
-DESCRIPTION="Keyboard-driven, vim-like browser based on Python and Qt"
-HOMEPAGE="https://qutebrowser.org/"
-
-LICENSE="GPL-3+"
-SLOT="0"
-IUSE="+adblock pdf +qt6 widevine"
-
-RDEPEND="
- $(python_gen_cond_dep '
- 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}]
- 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 )
- )
- widevine? ( www-plugins/chrome-binary-plugins )
- ')
-"
-BDEPEND="
- $(python_gen_cond_dep '
- test? (
- dev-python/beautifulsoup4[${PYTHON_USEDEP}]
- dev-python/cheroot[${PYTHON_USEDEP}]
- dev-python/flask[${PYTHON_USEDEP}]
- dev-python/hypothesis[${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}]
- qt6? ( dev-python/PyQt6[testlib] )
- !qt6? ( dev-python/PyQt5[testlib] )
- )
- ')
-"
-
-if [[ ${PV} == 9999 ]]; then
- BDEPEND+=" app-text/asciidoc"
-else
- BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-qutebrowser )"
-fi
-
-distutils_enable_tests pytest
-
-PATCHES=(
- "${FILESDIR}"/${P}-tests-qt653.patch
-)
-
-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
-
- # 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
-
- 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
- # 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=pyqt$(usex qt6 6 5)
-
- 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\]
- # 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
- )
-
- # skip benchmarks (incl. _tree), and warning tests broken by -Wdefault
- epytest -p xvfb -k 'not _bench and not _matches_tree and not _warning'
-}
-
-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_preinst() {
- xdg_pkg_preinst
-
- has_version "${CATEGORY}/${PN}[qt6]" && QUTEBROWSER_HAD_QT6=
-}
-
-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 [[ ! -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
-}
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2023-11-27 8:48 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-27 16:19 [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/files/, www-client/qutebrowser/ Stefan Strogin
-- strict thread matches above, loose matches on Subject: below --
2021-12-02 5:13 Ionen Wolkens
2022-12-11 18:14 Ionen Wolkens
2023-03-18 23:22 Ionen Wolkens
2023-09-17 1:59 Ionen Wolkens
2023-11-27 8:47 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox