gentoo auto-resync : 26:04:2024 - 23:59:36

3 files changed, 76 insertions, 1 deletions

diff --git a/www-client/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index 4a3dd8be6828..4e8cef7b8875 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,6 +1,7 @@
+AUX qutebrowser-3.1.0-pyqt670-tests.patch 2871 BLAKE2B 26aca8764e463a0dc6bcde05d7bda3ea41cfd8827eafcaca9f853444154039c666bb80d4bb40a0bdb99bd545764f0f9f50b78e0912c0fd86d78bbf7bf9e336ef SHA512 e979bb46e550500382a94bb94164bd2d6f36f48220c864fcd3e1f737a5c84b01434c9ec963c459ae502f419badab59a01ebf1b29f94758cbb3324c37fa95efeb
 AUX qutebrowser-3.1.0-qt663-tests.patch 622 BLAKE2B 6829a8c915f21d5cd28a2b867ad64f188837e915d64ddc3446421bc7a3b23657fee1ccd1758d242e9264eda0dc068f8e0473269c1e02c74adced530acf613a6c SHA512 8dc10dbb95e859861c06e57802e52dce634364d80b521aa398597161442388cef3f01b0fbeb96157f8189ce3b669132f4ef3e1dad23cd35c6abd72865e018e40
 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
-EBUILD qutebrowser-3.1.0-r1.ebuild 7174 BLAKE2B a540a43d7c76adbb07b9d7b798fbd194f1c0c9c4edfbde248c2ac577d485adb2b1cf4758436c8b181936741ac67b4134de86659bdb4ce0df3f5d751d0ef3ce78 SHA512 add55d37d96f5b22091cf48bc0fc9588b64fc0787f923f125711c8ff562dca2bb1168e175cefce3bbbb9a4b9f5bc9269c2aaa7186ef84c981d202030aeaeb2d6
+EBUILD qutebrowser-3.1.0-r1.ebuild 7214 BLAKE2B b45fec16f998fe12592868e4dee0a3a276b22f142e41856aa202779b255bd4afb9318d1ee999685ecb5aeb5515841210502bbb977a61e07b323f6443b5d360cb SHA512 cda34aef681d9e4390a6cd2eface82bdc6454d51383357c47083fa5f984999b6d039f4e5140ed1459b4fc9aabc40b6d264f6f16caa9616895fe85e50e1d76243
 EBUILD qutebrowser-9999.ebuild 5519 BLAKE2B 5f8e8c44ac7ea3a6dd6c94f55dd228cba91705e9ad95eb25f28eee9e3eeddacf55b79f9531a836ab21ba0da6273dae549528adb3e7236a9a16f809dfad3ba6e3 SHA512 6f1c073f264c243f43d55ef971e243c9043626ec7c62c5f003d0d8147b7a50c85112cc999ec141bb93662f8ac77ed359546249fc29f575ed3e3c6f22ca2224e7
 MISC metadata.xml 1018 BLAKE2B 9d0c406995b2036671113b6513c3ed2fdb5021eae9d1dde5c186efeccdde6dae127857e3e5898f7809edcc27eca4b47f37965155ac0ff21bedb78e242421fd54 SHA512 2af79f18d31f9efe8df852f4bca132caf1d79fc06f6388959deb367470d4975af541a75c70831b549d944112bcd0bc7e11510a81bce4ef1391fbf1354425b769
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 000000000000..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 <me@the-compiler.org>
+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() {