[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: ebbc8962ca5f78a43012b688ca17c3e8e50425b6
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Jun 28 12:20:00 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Jun 28 14:44:03 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebbc8962
www-client/qutebrowser: drop 3.1.0-r1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest| 2 -
.../files/qutebrowser-3.1.0-pyqt670-tests.patch| 73 ---
.../files/qutebrowser-3.1.0-qt663-tests.patch | 12 --
www-client/qutebrowser/metadata.xml| 1 -
www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild | 220 -
5 files changed, 308 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 3421d8c87579..a2e345783187 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,5 +1,3 @@
-DIST qutebrowser-3.1.0.tar.gz 6045747 BLAKE2B
d0cca696dd85bb99b8514331a392e1cb54fcbeff32fcf13e058739ef5a20ef1725980fbabef187a226f1cc29be9943784ba1f93275047586827922c3e98d0a64
SHA512
79dff3cf4ff93c75150e5cb9ada835ed5faf0343f03854266c6138fb8e6cceb921c868e1e408432da61b85ebe37e7e1657f634771ff73f1395d1b6e169138d98
-DIST qutebrowser-3.1.0.tar.gz.asc 659 BLAKE2B
023916e83cf2ac084f013ad750acf1ddb02a146197e92f703a96c54bceafcabf9d09a398c43e1679d0e425d54f13726c576c1b2e13707888e097952abef9797b
SHA512
f89369b0c61852c0ee22a476fcce0c8fc236920a2c6fbcfb945e010275650bdd133b6714ec2b64c1156789eb3f6f897cbf9a31441e913afcf9f19ea3113611f7
DIST qutebrowser-3.2.0.tar.gz 6054386 BLAKE2B
3f0589dbbc2dc34c4138bc7ea33ea090a6aff4abe087e7b80f0294789a252924fb90b2b0229e1513c96e863a612bf26579b6e895bc0b9b553c1b7439361ee589
SHA512
85980ccbb1982ecfb142a4e3fc0a66b8ac88f73c394a6c936b8f1a541ea30a65ee576abd7e202ac50fd943c85457d75b5ccac7d51ea34ff1b0f7eb8a647aa18d
DIST qutebrowser-3.2.0.tar.gz.asc 659 BLAKE2B
33d88c2d4020535616ee5d8ed8e517aabf24433ab9d712f12aa1f138398a60807a14383d300245ee7873ed027445034ced9c61ce52a54518a2cc240a01f2649f
SHA512
895e6d585f4d1d7373544d763663412136ef4b397565ddac24c1bcf16c75e96c8110cc8dea6fa8457799b893a2e3d2fca8979875b8e8423f270a70100d6e57db
DIST qutebrowser-3.2.1.tar.gz 6054942 BLAKE2B
7ddae7333b3ae906adc7811e0e383bb384c2105c59db935b96d165653f9570a249f3fedf9ad98f33d1ae7bd19f8637a3e1ed885f88aa724f4ceb61da4b8046a9
SHA512
753f053a157271806e273b667b656d64277d10d012d6940c5e023125e1f8fab151a32cf4defafe167141fe31461e6bf178d01b2d842f7252fd7405729a0edc68
diff --git a/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
b/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
deleted file mode 100644
index 8095c3fa02ce..
--- a/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-https://github.com/qutebrowser/qutebrowser/commit/1ee138b681a590ee500954361eed2cf923b1d8a0
-From: Florian Bruhin
-Date: Mon, 25 Mar 2024 23:19:37 +0100
-Subject: [PATCH] qtutils: Handle QDataStream.Status.SizeLimitExceeded
a/qutebrowser/utils/qtutils.py
-+++ b/qutebrowser/utils/qtutils.py
-@@ -193,6 +193,15 @@ def check_qdatastream(stream: QDataStream) -> None:
- QDataStream.Status.WriteFailed: ("The data stream cannot write to the
"
- "underlying device."),
- }
-+try:
-+status_to_str[QDataStream.Status.SizeLimitExceeded] = ( # type:
ignore[attr-defined]
-+"The data stream cannot read or write the data because its size
is larger "
-+"than supported by the current platform."
-+)
-+except AttributeError:
-+# Added in Qt 6.7
-+pass
-+
- if stream.status() != QDataStream.Status.Ok:
- raise OSError(status_to_str[stream.status()])
-
a/tests/unit/utils/test_qtutils.py
-+++ b/tests/unit/utils/test_qtutils.py
-@@ -208,6 +208,18 @@ def test_ensure_valid(obj, raising, exc_reason, exc_str):
- "The data stream has read corrupt data."),
- (QDataStream.Status.WriteFailed, True,
- "The data stream cannot write to the underlying device."),
-+pytest.param(
-+getattr(QDataStream.Status, "SizeLimitExceeded", None),
-+True,
-+(
-+"The data stream cannot read or write the data because its size
is larger "
-+"than supported by the current platform."
-+),
-+marks=pytest.mark.skipif(
-+not hasattr(QDataStream.Status, "SizeLimitExceeded"),
-+reason="Added in Qt 6.7"
-+)
-+),
- ])
- def test_check_qdatastream(status, raising, message):
- """Test check_qdatastream.
-@@ -226,10 +238,25 @@ def test_check_qdatastream(status, raising, message):
- qtutils.check_qdatastream(stream)
-
-
--def test_qdatastream_status_count():
--"""Make sure no new members are added to QDataStream.Status."""
--status_vals = testutils.enum_members(QDataStream, QDataStream.Status)
--assert
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: ad94d2fe89249c6d7c7f8962668e409bcdfa464f
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Apr 26 11:25:15 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Apr 26 11:30:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad94d2fe
www-client/qutebrowser: backport tests fix for PyQt6-6.7.0
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/qutebrowser-3.1.0-pyqt670-tests.patch| 73 ++
www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild | 1 +
2 files changed, 74 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
b/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
new file mode 100644
index ..8095c3fa02ce
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-3.1.0-pyqt670-tests.patch
@@ -0,0 +1,73 @@
+https://github.com/qutebrowser/qutebrowser/commit/1ee138b681a590ee500954361eed2cf923b1d8a0
+From: Florian Bruhin
+Date: Mon, 25 Mar 2024 23:19:37 +0100
+Subject: [PATCH] qtutils: Handle QDataStream.Status.SizeLimitExceeded
+--- a/qutebrowser/utils/qtutils.py
b/qutebrowser/utils/qtutils.py
+@@ -193,6 +193,15 @@ def check_qdatastream(stream: QDataStream) -> None:
+ QDataStream.Status.WriteFailed: ("The data stream cannot write to the
"
+ "underlying device."),
+ }
++try:
++status_to_str[QDataStream.Status.SizeLimitExceeded] = ( # type:
ignore[attr-defined]
++"The data stream cannot read or write the data because its size
is larger "
++"than supported by the current platform."
++)
++except AttributeError:
++# Added in Qt 6.7
++pass
++
+ if stream.status() != QDataStream.Status.Ok:
+ raise OSError(status_to_str[stream.status()])
+
+--- a/tests/unit/utils/test_qtutils.py
b/tests/unit/utils/test_qtutils.py
+@@ -208,6 +208,18 @@ def test_ensure_valid(obj, raising, exc_reason, exc_str):
+ "The data stream has read corrupt data."),
+ (QDataStream.Status.WriteFailed, True,
+ "The data stream cannot write to the underlying device."),
++pytest.param(
++getattr(QDataStream.Status, "SizeLimitExceeded", None),
++True,
++(
++"The data stream cannot read or write the data because its size
is larger "
++"than supported by the current platform."
++),
++marks=pytest.mark.skipif(
++not hasattr(QDataStream.Status, "SizeLimitExceeded"),
++reason="Added in Qt 6.7"
++)
++),
+ ])
+ def test_check_qdatastream(status, raising, message):
+ """Test check_qdatastream.
+@@ -226,10 +238,25 @@ def test_check_qdatastream(status, raising, message):
+ qtutils.check_qdatastream(stream)
+
+
+-def test_qdatastream_status_count():
+-"""Make sure no new members are added to QDataStream.Status."""
+-status_vals = testutils.enum_members(QDataStream, QDataStream.Status)
+-assert len(status_vals) == 4
++def test_qdatastream_status_members():
++"""Make sure no new members are added to QDataStream.Status.
++
++If this fails, qtutils.check_qdatastream will need to be updated with the
++respective error documentation.
++"""
++status_vals = set(testutils.enum_members(QDataStream,
QDataStream.Status).values())
++expected = {
++QDataStream.Status.Ok,
++QDataStream.Status.ReadPastEnd,
++QDataStream.Status.ReadCorruptData,
++QDataStream.Status.WriteFailed,
++}
++try:
++expected.add(QDataStream.Status.SizeLimitExceeded)
++except AttributeError:
++# Added in Qt 6.7
++pass
++assert status_vals == expected
+
+
+ @pytest.mark.parametrize('color, expected', [
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
index f40f5009dff3..3eb916073966 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0-r1.ebuild
@@ -83,6 +83,7 @@ distutils_enable_tests pytest
PATCHES=(
"${FILESDIR}"/${P}-qt663-tests.patch
+ "${FILESDIR}"/${P}-pyqt670-tests.patch
)
src_prepare() {
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: 89949e527754f03fed66122a4302e5ac5b409d6d
Author: Ionen Wolkens gentoo org>
AuthorDate: Fri Mar 22 02:19:07 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Mar 22 02:23:09 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89949e52
www-client/qutebrowser: fix tests qith upcoming Qt6.6.3+6.7.0
Thought this was 6.7.0-only at first, but seems it was backported
to 6.6.3 which should release very soon.
Not touching live given upstream is likely to look more closely at
6.7.0 issues soon.
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser/files/qutebrowser-3.1.0-qt663-tests.patch| 12
www-client/qutebrowser/qutebrowser-3.1.0.ebuild | 4
2 files changed, 16 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-3.1.0-qt663-tests.patch
b/www-client/qutebrowser/files/qutebrowser-3.1.0-qt663-tests.patch
new file mode 100644
index ..e262623ab1c7
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-3.1.0-qt663-tests.patch
@@ -0,0 +1,12 @@
+6.6.3 and 6.7.0-rc start to emit a new warning that causes:
+test_browsertab.py:13: Failure: Qt messages with level WARNING or above emitted
+
+It still seems(?) to be able to find qutebrowser's installed dictionaries
+fine and spellchecking works. Let's just ignore this warning for now.
+--- a/pytest.ini
b/pytest.ini
+@@ -63,2 +63,4 @@
+ Error in contacting registry:
"org\.freedesktop\.DBus\.Error\.Disconnected" "Not connected to D-Bus server"
++# Qt 6.6.3 and 6.7.0, not looked into but spellchecking still functions
++^Path override failed for key base::DIR_APP_DICTIONARIES and path .*
+ xfail_strict = true
diff --git a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
index 8bf80f2e1370..b71080584826 100644
--- a/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
+++ b/www-client/qutebrowser/qutebrowser-3.1.0.ebuild
@@ -81,6 +81,10 @@ fi
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-qt663-tests.patch
+)
+
src_prepare() {
distutils-r1_src_prepare
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: ef9afe012b1708dd6eec8b9c888b66b019d1fecf
Author: Ionen Wolkens gentoo org>
AuthorDate: Tue Sep 26 23:45:16 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Sep 27 00:00:13 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef9afe01
Revert "www-client/qutebrowser: drop 6.5.3 tests workaround"
This reverts commit 33ef6a9d4df3ea6a0c688b0bb3bde2f7fa5e481d.
Actually still cause problems with 6.6.0-rc, going to keep
this around for a bit longer and see how it goes.
Signed-off-by: Ionen Wolkens 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 ..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 f2467c8a47d8..189d01f0bdf8 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
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: 8ab0af2d2de53e11130eb6eeb8f2ad7c27e8c47f
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Sep 18 11:51:52 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Sep 18 11:51:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8ab0af2d
www-client/qutebrowser: drop 2.5.4-r1
Signed-off-by: Ionen Wolkens gentoo.org>
www-client/qutebrowser/Manifest| 1 -
.../qutebrowser-2.5.4-tests-python-3.11.4.patch| 102 -
www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild | 162 -
3 files changed, 265 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 92c58976db37..f985470fac4a 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,3 +1,2 @@
-DIST qutebrowser-2.5.4.tar.gz 6117674 BLAKE2B
d8dedf57ac064ce1a3d2e4e854a0064dfe567260cadfcdf129c2a2bcdbd26aaa21a569e3f69300c75e5dfb363b62173ac6e5f11e4bcd4a5c8dd72697b4caa5c3
SHA512
1c500cda921a273dee14b1e0808786bbfd2ce53ea9b4d5114be9abdacbefa5d3c7580d2995ad0100f597b9bf54addf4c98dbd4b924d9e8d3d08fe30309e44c3e
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
diff --git
a/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
b/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
deleted file mode 100644
index 909bd3acfab7..
--- a/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-Backports for tests broken by python-3.11.4.
-https://bugs.gentoo.org/910742
-
-IPv6 tests are notably related to https://bugs.gentoo.org/909747
-
-https://github.com/qutebrowser/qutebrowser/commit/e1d0b3c543fc470a0459a18be3dee5a151ed79ed
-https://github.com/qutebrowser/qutebrowser/commit/5d890f14d093689e53fcbdec3d739daf04a8aae4
-...was for 3.12 but change was backported to 3.11.4 which led to:
-https://github.com/qutebrowser/qutebrowser/commit/8b058389b7db591fb52b99fe9f7afbacfeabd901
a/tests/unit/config/test_configfiles.py
-+++ b/tests/unit/config/test_configfiles.py
-@@ -1102,7 +1102,14 @@
- error = excinfo.value.errors[0]
--assert isinstance(error.exception, ValueError)
--assert error.text == "Error while compiling"
-+
-+if sys.version_info >= (3, 11, 4):
-+assert isinstance(error.exception, SyntaxError)
-+assert error.text == "Unhandled exception"
-+assert error.traceback is not None # tested in more detail by
test below
-+else:
-+assert isinstance(error.exception, ValueError)
-+assert error.text == "Error while compiling"
-+assert error.traceback is None
-+
- exception_text = 'source code string cannot contain null bytes'
- assert str(error.exception) == exception_text
--assert error.traceback is None
-
a/tests/unit/utils/test_urlmatch.py
-+++ b/tests/unit/utils/test_urlmatch.py
-@@ -42,2 +42,8 @@
-
-+_INVALID_IP_MESSAGE = (
-+r'Invalid IPv6 address; source was ".*"; host = ""|'
-+r"'.*' does not appear to be an IPv4 or IPv6 address" # Python 3.11.4+
-+)
-+
-+
- @pytest.mark.parametrize('pattern, error', [
-@@ -62,3 +68,7 @@
- ## TEST(ExtensionURLPatternTest, IPv6Patterns)
--pytest.param("http://[]:/*;, "Pattern without host", id='host-ipv6'),
-+pytest.param(
-+"http://[]:/*;,
-+"Pattern without host|'' does not appear to be an IPv4 or IPv6
address",
-+id='host-ipv6',
-+),
-
-@@ -89,3 +99,6 @@
- "http://[[2607:f8b0:4005:805::200e]/*;,
--r"""Expected '\]' to match '\[' in hostname; source was
"\[2607:f8b0:4005:805::200e"; host = ",
-+(
-+r'''Expected '\]' to match '\[' in hostname; source was
"\[2607:f8b0:4005:805::200e"; host = ""|'''
-+r"'\[2607:f8b0:4005:805::200e' does not appear to be an IPv4 or
IPv6 address"
-+),
- id='host-ipv6-two-open',
-@@ -95,3 +108,3 @@
- "http://[2607:f8b0:4005:805:200e]/*;,
--'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e"; host =
""',
-+_INVALID_IP_MESSAGE,
- id='host-ipv6-colons',
-@@ -101,3 +114,3 @@
- "http://[2607:f8b0:4005:805:200e:12:bogus]/*;,
--'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e:12:bogus";
host = ""',
-+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: 4572075395f82d95930d4162686f62a256c70888
Author: Ionen Wolkens gentoo org>
AuthorDate: Mon Jul 24 04:17:48 2023 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Mon Jul 24 04:25:35 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45720753
www-client/qutebrowser: fix tests with python-3.11.4
No consequence on runtime, just tests issues. Already fixed
in live nearly two months ago. Doesn't hurt to backport so
can have a working reference when major qutebrowser-3.0.0
releases.
Closes: https://bugs.gentoo.org/910742
Signed-off-by: Ionen Wolkens gentoo.org>
.../qutebrowser-2.5.4-tests-python-3.11.4.patch| 102 +
www-client/qutebrowser/qutebrowser-2.5.4-r1.ebuild | 4 +
2 files changed, 106 insertions(+)
diff --git
a/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
b/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
new file mode 100644
index ..909bd3acfab7
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.5.4-tests-python-3.11.4.patch
@@ -0,0 +1,102 @@
+Backports for tests broken by python-3.11.4.
+https://bugs.gentoo.org/910742
+
+IPv6 tests are notably related to https://bugs.gentoo.org/909747
+
+https://github.com/qutebrowser/qutebrowser/commit/e1d0b3c543fc470a0459a18be3dee5a151ed79ed
+https://github.com/qutebrowser/qutebrowser/commit/5d890f14d093689e53fcbdec3d739daf04a8aae4
+...was for 3.12 but change was backported to 3.11.4 which led to:
+https://github.com/qutebrowser/qutebrowser/commit/8b058389b7db591fb52b99fe9f7afbacfeabd901
+--- a/tests/unit/config/test_configfiles.py
b/tests/unit/config/test_configfiles.py
+@@ -1102,7 +1102,14 @@
+ error = excinfo.value.errors[0]
+-assert isinstance(error.exception, ValueError)
+-assert error.text == "Error while compiling"
++
++if sys.version_info >= (3, 11, 4):
++assert isinstance(error.exception, SyntaxError)
++assert error.text == "Unhandled exception"
++assert error.traceback is not None # tested in more detail by
test below
++else:
++assert isinstance(error.exception, ValueError)
++assert error.text == "Error while compiling"
++assert error.traceback is None
++
+ exception_text = 'source code string cannot contain null bytes'
+ assert str(error.exception) == exception_text
+-assert error.traceback is None
+
+--- a/tests/unit/utils/test_urlmatch.py
b/tests/unit/utils/test_urlmatch.py
+@@ -42,2 +42,8 @@
+
++_INVALID_IP_MESSAGE = (
++r'Invalid IPv6 address; source was ".*"; host = ""|'
++r"'.*' does not appear to be an IPv4 or IPv6 address" # Python 3.11.4+
++)
++
++
+ @pytest.mark.parametrize('pattern, error', [
+@@ -62,3 +68,7 @@
+ ## TEST(ExtensionURLPatternTest, IPv6Patterns)
+-pytest.param("http://[]:/*;, "Pattern without host", id='host-ipv6'),
++pytest.param(
++"http://[]:/*;,
++"Pattern without host|'' does not appear to be an IPv4 or IPv6
address",
++id='host-ipv6',
++),
+
+@@ -89,3 +99,6 @@
+ "http://[[2607:f8b0:4005:805::200e]/*;,
+-r"""Expected '\]' to match '\[' in hostname; source was
"\[2607:f8b0:4005:805::200e"; host = ",
++(
++r'''Expected '\]' to match '\[' in hostname; source was
"\[2607:f8b0:4005:805::200e"; host = ""|'''
++r"'\[2607:f8b0:4005:805::200e' does not appear to be an IPv4 or
IPv6 address"
++),
+ id='host-ipv6-two-open',
+@@ -95,3 +108,3 @@
+ "http://[2607:f8b0:4005:805:200e]/*;,
+-'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e"; host =
""',
++_INVALID_IP_MESSAGE,
+ id='host-ipv6-colons',
+@@ -101,3 +114,3 @@
+ "http://[2607:f8b0:4005:805:200e:12:bogus]/*;,
+-'Invalid IPv6 address; source was "2607:f8b0:4005:805:200e:12:bogus";
host = ""',
++_INVALID_IP_MESSAGE,
+ id='host-ipv6-non-hex',
+@@ -155,3 +168,3 @@
+ "http://[fc2e::bb88::edac];,
+-'Invalid IPv6 address; source was "fc2e::bb88::edac"; host = ""',
++_INVALID_IP_MESSAGE,
+ id='ipv6-double-double',
+@@ -160,3 +173,3 @@
+ "http://[fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac];,
+-'Invalid IPv6 address; source was
"fc2e:0e35:bb88::edac:fc2e:0e35:bb88:edac"; host = ""',
++_INVALID_IP_MESSAGE,
+ id='ipv6-long-double',
+@@ -165,3 +178,3 @@
+ "http://[fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac];,
+-'Invalid IPv6 address; source was
"fc2e:0e35:bb88:af:edac:fc2e:0e35:bb88:edac"; host = ""',
++_INVALID_IP_MESSAGE,
+ id='ipv6-long',
+@@ -170,3 +183,3 @@
+ "http://[127.0.0.1:fc2e::bb88:edac];,
+-r'Invalid IPv6 address; source was "127\.0\.0\.1:fc2e::bb88:edac',
++_INVALID_IP_MESSAGE,
+ id='ipv6-ipv4',
+@@ -176,3 +189,3 @@
+
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: fffd8606988d3eebc7324f6353d01469c18cfe81
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Oct 14 13:30:43 2021 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Fri Oct 15 15:43:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fffd8606
www-client/qutebrowser: backport pyyaml-6.0 test fix
Closes: https://github.com/gentoo/gentoo/pull/22571
Signed-off-by: Ionen Wolkens gentoo.org>
.../files/qutebrowser-2.3.1-pyyaml60.patch| 19 +++
www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild| 4
2 files changed, 23 insertions(+)
diff --git a/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
new file mode 100644
index 000..d585109b9f2
--- /dev/null
+++ b/www-client/qutebrowser/files/qutebrowser-2.3.1-pyyaml60.patch
@@ -0,0 +1,19 @@
+https://github.com/qutebrowser/qutebrowser/commit/1547a48
+From: Florian Bruhin
+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
index f196542337c..3a90e9763a2 100644
--- a/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
+++ b/www-client/qutebrowser/qutebrowser-2.3.1-r2.ebuild
@@ -58,6 +58,10 @@ BDEPEND="
distutils_enable_tests pytest
+PATCHES=(
+ "${FILESDIR}"/${P}-pyyaml60.patch
+)
+
python_prepare_all() {
distutils-r1_python_prepare_all
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: 70e4bb05d4fbde54ded8fdef1aec5b1f5e5f3bcb
Author: Stefan Strogin gentoo org>
AuthorDate: Thu Jul 9 17:09:25 2020 +
Commit: Stefan Strogin gentoo org>
CommitDate: Thu Jul 9 17:15:08 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70e4bb05
www-client/qutebrowser: drop old 1.11.1-r1
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Stefan Strogin gentoo.org>
www-client/qutebrowser/Manifest| 1 -
.../files/qutebrowser-1.11.1-session-restore.patch | 45 -
.../qutebrowser/qutebrowser-1.11.1-r1.ebuild | 77 --
3 files changed, 123 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 61af532234d..086064b7539 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,3 +1,2 @@
-DIST qutebrowser-1.11.1.tar.gz 6789139 BLAKE2B
0f13c30a629a7ce6339a8506f1a16bbe6123fd28de9ada2f8105a2434d8493549aa79e5d42e7b871dc25e23866b36ecbb712ddfdfc4db139b2a6ee712f8aeb4a
SHA512
56f18bc4d9a64e37f73a6ea69953c1a6a06d88c033c2484528b19475616c3229c2aa75f4fbf27668aef7a08358491eb27b3d8e16049021478ba8b4be7433f61f
DIST qutebrowser-1.12.0.tar.gz 3979851 BLAKE2B
1a55c8b10aea5b618c0aa730828a123b127f1185d4e3f57b48f5c741c1bd5600e92b5e1bd48a1d3df94449eec650bb6f0d8b84a0c1f6f5ece045a6a0bce5583f
SHA512
a8d979310f7c00a64b8cf976529def09b9a42542c80dd7055e2a38a174d9ef51834de6e816739911454a73ad9cc79a7d3e1fcda7d76bade463bc253aeb9ef608
DIST qutebrowser-1.13.0.tar.gz 4015550 BLAKE2B
cc2f2779ca994da48e85156d5bba0a70f6f5380bc6c362e05944a2454e22ee99acf15875def448675ea86af8a919290dfaca5abf97ee5603e6c2b0d2ed41fabb
SHA512
ee598db9416e4efcf5d8bc6aaa3d373637ed67f181e67e56c04fd7f2c12ebaf185f67a9463fff195d74ff7a239ce0a88c24bf35d3ad627116e2fa5ebed973d3d
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
deleted file mode 100644
index 060c94eee6b..000
--- a/www-client/qutebrowser/files/qutebrowser-1.11.1-session-restore.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 22e15acc1e617174a9fde3e53100a1b71ca7f462 Mon Sep 17 00:00:00 2001
-From: Florian Bruhin
-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 @@ {{ title }}
-
-
- Loading a session with this release will only load the most
recently opened page for every tab. As a result, the back/forward-history
of every tab will be lost as soon as the session is saved again.
-+Due to that, the session.lazy_restore
setting does not have any effect.
- A one-time backup of the session folder has been created at {{ datadir }}{{ sep }}sessions{{ sep }}before-qt-515.
-
-
diff --git a/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild
b/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild
deleted file mode 100644
index 2cfc68ac7db..000
--- a/www-client/qutebrowser/qutebrowser-1.11.1-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python{3_6,3_7,3_8} )
-DISTUTILS_USE_SETUPTOOLS="rdepend"
-
-inherit desktop distutils-r1 eutils xdg-utils
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and
QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/
https://github.com/qutebrowser/qutebrowser;
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz;
-
[gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/, www-client/qutebrowser/files/
commit: 3d0d5b6946b13562f20ba6a5a9efa0102c35fe65
Author: Tim Harder gentoo org>
AuthorDate: Fri Mar 11 03:13:58 2016 +
Commit: Tim Harder gentoo org>
CommitDate: Fri Mar 11 03:15:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d0d5b69
www-client/qutebrowser: remove old
www-client/qutebrowser/Manifest| 2 -
.../files/qutebrowser-0.2.1-exclude-scripts.patch | 13
www-client/qutebrowser/qutebrowser-0.2.1.ebuild| 70 --
www-client/qutebrowser/qutebrowser-0.3.0.ebuild| 68 -
www-client/qutebrowser/qutebrowser-0.4.1.ebuild| 69 -
5 files changed, 222 deletions(-)
diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 19c9990..d3ad0c5 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,4 +1,2 @@
-DIST qutebrowser-0.2.1.tar.gz 892955 SHA256
0738377c1069d7d9ce1ff61e7425a139b44d21493d3a5c6338d697eb54f26d31 SHA512
9c49779515e6d7a3c9b93d50b51138f20292712f08de6f682db4f452c893796d9c66af7cca9ab7c18a5b7ddc147d62b7649572c7cdd416cc67c81cdf462c4f01
WHIRLPOOL
5f2f42163b59490eda25bad390c71113c8e7725a7bd8fa47240516a336364c76a7f97c516996f1ffcbc11025785070a30a6bccdcd66a06459ffbb24f874ed960
-DIST qutebrowser-0.3.0.tar.gz 938380 SHA256
a0c02148bf76eb13691d9476e6ab8bc791993dfe7a408974ba31dd6eb6584461 SHA512
ee0e5808f7732c3c4cd577beb9c25227af0b6a3136bd20b80e18fef20a0d7ae34111f40db2bc0071e34a92c0b0dc94c8899f0953107b4926ff5ba2894fc818e0
WHIRLPOOL
95bd3e1a8c065a31d816ea8f7d85649d937aed6ddf85cb28ad309cab2d7ed0b9dc72672106321be9a2d0a085622114fc340122920c4c528750e70636d88930d3
DIST qutebrowser-0.4.1.tar.gz 909363 SHA256
6e1022e4b349fd09bd8efa643d2411badb8305fee911d266db5dce66290a3ed7 SHA512
a31b3a99010babf26c4e9c867840d419e0f2f3acf874d9b61812744d1845914fd2505c8178976a14e57286842706431ad6305773e7087db6a4d4105b91c98aed
WHIRLPOOL
2176e54fcff48b6b81629040b9826ea981b5eec963b506a54194d60a12a971763df9609f00958b30f61c209acf306faa2290f58d81590eed89e0b3705a2b9b9f
DIST qutebrowser-0.5.1.tar.gz 1007393 SHA256
0b7f8ee4b45d680c0fe7a31987b634723c3e45ef05a874d99b24ed4cc055afdf SHA512
9e61b2347da349de720e5d796ec54efbe904b641a06babf9bdef98a742240cbf708264acff0ed70b7df040115e18d3bb8315a9ef7e9c402ac3eda4ca0e6c5636
WHIRLPOOL
21f0617478a17e655729ea764095e1ac36a8f3f445652a3f88793c0fc9cbce5a670ec44ab49e2b9d09490a47b9b080fc5a7215ee4aa6e10031577e34cf7e66bf
diff --git
a/www-client/qutebrowser/files/qutebrowser-0.2.1-exclude-scripts.patch
b/www-client/qutebrowser/files/qutebrowser-0.2.1-exclude-scripts.patch
deleted file mode 100644
index f9f9491..000
--- a/www-client/qutebrowser/files/qutebrowser-0.2.1-exclude-scripts.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Don't install development scripts.
-
qutebrowser-0.2.1/setup.py
-+++ qutebrowser-0.2.1/setup.py
-@@ -38,7 +38,7 @@
- try:
- common.write_git_file()
- setuptools.setup(
--packages=setuptools.find_packages(exclude=['qutebrowser.test']),
-+packages=setuptools.find_packages(exclude=['qutebrowser.test',
'scripts']),
- include_package_data=True,
- entry_points={'gui_scripts':
- ['qutebrowser = qutebrowser.qutebrowser:main']},
diff --git a/www-client/qutebrowser/qutebrowser-0.2.1.ebuild
b/www-client/qutebrowser/qutebrowser-0.2.1.ebuild
deleted file mode 100644
index 949e4d8..000
--- a/www-client/qutebrowser/qutebrowser-0.2.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python3_4 )
-
-inherit distutils-r1 eutils fdo-mime
-
-if [[ ${PV} == "" ]] ; then
- EGIT_REPO_URI="https://github.com/The-Compiler/qutebrowser.git;
- inherit git-r3
-else
- SRC_URI="https://github.com/The-Compiler/${PN}/archive/v${PV}.tar.gz ->
${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebKit"
-HOMEPAGE="https://github.com/The-Compiler/qutebrowser;
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="gstreamer test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
- app-text/asciidoc
- test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
- >=dev-python/jinja-2.7.3[${PYTHON_USEDEP}]
- >=dev-python/pygments-2.0.2[${PYTHON_USEDEP}]
- >=dev-python/pypeg2-2.15.1[${PYTHON_USEDEP}]
-
dev-python/PyQt5[${PYTHON_USEDEP},gui,network,printsupport,webkit,widgets]
- >=dev-python/pyyaml-3.11[${PYTHON_USEDEP}]
- gstreamer? ( dev-qt/qtwebkit:5[gstreamer] )
-"
-
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${P}-exclude-scripts.patch )
-
-python_compile_all() {
- if [[ ${PV} == "" ]]; then
- "${PYTHON}" scripts/asciidoc2html.py || die "Failed generating
docs"
- fi
-
- a2x -f manpage
