From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id D539415800A for ; Sat, 22 Jul 2023 12:28:12 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 25314E07F1; Sat, 22 Jul 2023 12:28:12 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0A108E07F1 for ; Sat, 22 Jul 2023 12:28:12 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 19051335CB4 for ; Sat, 22 Jul 2023 12:28:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB7D2BE2 for ; Sat, 22 Jul 2023 12:28:09 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1690028880.0aa673fe2b450a8eaa43d718b85cba6134fbb079.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: www-client/qutebrowser/ X-VCS-Repository: repo/gentoo X-VCS-Files: www-client/qutebrowser/qutebrowser-9999.ebuild X-VCS-Directories: www-client/qutebrowser/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 0aa673fe2b450a8eaa43d718b85cba6134fbb079 X-VCS-Branch: master Date: Sat, 22 Jul 2023 12:28:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 1ee1130a-50e6-4b43-bdb1-1e61500a7980 X-Archives-Hash: 464e986c1662ddedacac9baf103a2b18 commit: 0aa673fe2b450a8eaa43d718b85cba6134fbb079 Author: Ionen Wolkens gentoo org> AuthorDate: Sat Jul 22 12:03:25 2023 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Sat Jul 22 12:28:00 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa673fe www-client/qutebrowser: update live Now defaults to Qt6 and auto-fallbacks to Qt5 if missing or broken, but there is little reason to use automagic in our case and it should use the backend ebuild set dependencies for (users can still override this at runtime if really wanted). Using sed is what machinery.py suggests. On a side-note, selected qt6 tests currently pass and qt5 has one failure. Will be reviewed further on release. Signed-off-by: Ionen Wolkens gentoo.org> www-client/qutebrowser/qutebrowser-9999.ebuild | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/www-client/qutebrowser/qutebrowser-9999.ebuild b/www-client/qutebrowser/qutebrowser-9999.ebuild index 2a80f2b1aa5d..0e11fd896ab8 100644 --- a/www-client/qutebrowser/qutebrowser-9999.ebuild +++ b/www-client/qutebrowser/qutebrowser-9999.ebuild @@ -88,11 +88,9 @@ src_prepare() { -i ${PN}/config/qtargs.py || die fi - # default to the requested Qt backend, current default is PyQt5 but - # sed unconditionally for safety in 9999 given this is going to change - # (note that using sed is the suggested solution by upstream for now) - sed -e "/^_DEFAULT_WRAPPER =/s/=.*/= \"PyQt$(usex qt6 6 5)\"/" \ - -i ${PN}/qt/machinery.py || die + # 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 @@ -130,9 +128,12 @@ python_test() { # not worth running dbus over tests/unit/browser/test_notification.py::TestDBus # bug 819393 - tests/unit/commands/test_userscripts.py::test_custom_env[_POSIXUserscriptRunner] - # tests that don't know about our newer qtwebengine:5 + tests/unit/commands/test_userscripts.py::test_custom_env\[_POSIXUserscriptRunner\] + # test does not know about our newer fixed qtwebengine:5 tests/unit/browser/webengine/test_webenginedownloads.py::TestDataUrlWorkaround + # 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} ) # qtargs are mangled with widevine+prefix use widevine && use prefix && EPYTEST_DESELECT+=( tests/unit/config/test_qtargs.py )