gentoo resync : 12.05.2022

5 files changed, 92 insertions, 53 deletions

diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 4f5b1bba77ab..3e9c393fd1cf 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,7 +1,7 @@
-DIST krunner-5.90.0.tar.xz 84212 BLAKE2B ac561fd57fc04fccc2084f9f42f63e91ce34161e8c2f0196bccaa13ec2f1b4e3bc72fa816647197f7dec81ca7dc6a1c53c28f3e5d19cf27252f942fbc12dc1fe SHA512 46673979dba79372d422ce956a59c5b34b7ce5a4e6e86ed98ad5f384d7c9a9d61c4b8cc83d367174e8fbe0db612544c71983331e93aadfa498011185e537a353
+AUX krunner-5.92.0-drop-runnermanagertest-timeouts.patch 3358 BLAKE2B daadf28ea4a1163f4585b96341535219a2e816688b390f7bcdb949528ee2209448a750469cddac96692c032ad49c122c304642bec207e101415c1931fdd89b1d SHA512 202361b35b0ef0bb365c73417a8026e59b5f4126fce0289f8c4a9bfee39b3035a14fe1df9be631c9033ed561d9fb11ec416cb2cca604d3e4a303751afc5451de
+AUX krunner-5.92.0-increase-runnermanagertest-timeout.patch 1080 BLAKE2B c81f86dfdf44a4a3f54caddf87bd3eaa802549e3d53c19284b5910d73036b2f4f66f3023665d62cd4a0b8831b4725023c07d4b8c5479ea1674bfedd181baf605 SHA512 50d17e56d2a34dda95e3505318678fd83db6f7ebf1d3d00ddf153b134d8bf3473d2127f81232e44d235fc43da5afbd575998571b627142646011334b3a6cae7b
 DIST krunner-5.92.0.tar.xz 86108 BLAKE2B 570e67bac19646d7107c55dd607fda359334e3fe4cb72c6c80235b03f91e238f814b93486d9d3668880a2aed9d3a8bc2b6e518ac71e29943b0fd476235360052 SHA512 7959d1a7f55b6c2d55f2e4e65aef11d5a5cdf5e7b7bf5b702d1da4ed02c8e05a3c36dc5e70bfa443303863d98dc0cc7c418ebc46cbf68fad5baed4f2389bce35
 DIST krunner-5.93.0.tar.xz 86100 BLAKE2B 01d16ab2a078f21e8183dec48fc227cdc231cba788a70c9d48cd568f74347b7f8adab787567b0b32a3a6f764b703a056def8ebcf1a64e04b2147b3a150240467 SHA512 45088539e5e016bcc58090f4bb40e5632b773ceaf2a724142b7f6469eb47b1d405c35ba91e92381caa3efc3d7cf3179975cf2dbfa74f859223bd668cc96707d6
-EBUILD krunner-5.90.0.ebuild 1154 BLAKE2B dc84a86771ee5b5009c23c7856be141f7c49c3c1ce85223ae7212ccb3127128a715666332e77dfc32f5445bd66fc40e8dc2342b69f65d7885e1d16ccc01777d9 SHA512 b07ce70bb8050b73dc72f0cdcf728281dc697dfa1f8f67127c9814f63f0614b1caa90db9859c043005a3f4bf64abf68dec78937cc2b9af8b5b5bb00a702b89b8
-EBUILD krunner-5.92.0.ebuild 1157 BLAKE2B fce0c74e6d088123ae9b8723f0e66f0f65a468e463d9875093dedf680815230df0b4e032ad5bc618d73ef2e89317715d957895586d1c613f2d7d22b94f112fe3 SHA512 51ffee805cabe5704cb439caf212627cb8de8e5a0726ced0b27a931f28ed9440b563d9a554f26bbc16a8fd961c670da3d43fec7590593d2de1cd498fed1faa6c
+EBUILD krunner-5.92.0.ebuild 1313 BLAKE2B f9d32bcdc233a61145c4e9968c765cb3290afcacd6a6156da8f56c384b334e7016b1ceb327bb498d95be63d83624643bcbb8e712e0cbb0c8d5ba42c40a3a8f68 SHA512 8903d3d7386c793154825de5fb19be2ffbbd22c34719e699936c8875909a22b38bbbafa0ab6edcc8b4790ade115534a29b573d2ae8dcdd3194f22158e10baadc
 EBUILD krunner-5.93.0.ebuild 1157 BLAKE2B fce0c74e6d088123ae9b8723f0e66f0f65a468e463d9875093dedf680815230df0b4e032ad5bc618d73ef2e89317715d957895586d1c613f2d7d22b94f112fe3 SHA512 51ffee805cabe5704cb439caf212627cb8de8e5a0726ced0b27a931f28ed9440b563d9a554f26bbc16a8fd961c670da3d43fec7590593d2de1cd498fed1faa6c
 MISC metadata.xml 552 BLAKE2B 6fc263110547ce6552754eceb08fa408b798642c8525e975ef326a154776129839872f1f66d72b499070b18af12f0dd5a84a8dc06287648c5fd00602c1a72ab1 SHA512 ab8b303f3c07000e126031e092019f3226cf59b191c221e1de39ce32bf44fede7918516be74bafda1886154026d1504c0ad3652b8ae9efe65831f09fbe8d52a8
diff --git a/kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch b/kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch
new file mode 100644
index 000000000000..1d6c654f631e
--- /dev/null
+++ b/kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch
@@ -0,0 +1,55 @@
+From f324dd5fc477888517db7b431bc291d0712969af Mon Sep 17 00:00:00 2001
+From: Eduardo de Souza Cruz <eduardo.cruz@kdemail.net>
+Date: Mon, 14 Mar 2022 14:12:17 -0300
+Subject: [PATCH] Remove upper-limits for RunnerManagerTest's timeouts
+
+Those upper-limits timeouts were not conservative enough for the Continuous Integration environment which can be slow and this test was failing sometimes.
+
+The upper-limits timing verifications were removed without too much prejudice to the overall test. It should still serve its purpose to guarantee there will be no regression on this functionality.
+---
+ autotests/runnermanagertest.cpp | 13 ++++++-------
+ 1 file changed, 6 insertions(+), 7 deletions(-)
+
+diff --git a/autotests/runnermanagertest.cpp b/autotests/runnermanagertest.cpp
+index 02c0985..82bd2a4 100644
+--- a/autotests/runnermanagertest.cpp
++++ b/autotests/runnermanagertest.cpp
+@@ -74,8 +74,9 @@ private Q_SLOTS:
+         // However not yet a matcheschanged, it should be stalled for 250ms
+         QCOMPARE(spyMatchesChanged.count(), 0);
+ 
+-        // After 250ms it will emit with empty matches, we wait for that
+-        QVERIFY(spyMatchesChanged.wait(265)); // 265ms as a margin of safety for 250ms
++        // After 250ms it will emit with empty matches, we wait for that.
++        // We can't put a low upper limit on these wait() calls because the CI environment can be slow.
++        QVERIFY(spyMatchesChanged.wait()); // This should take just a tad longer than 250ms.
+ 
+         // This should have taken no less than 250ms. It waits for 250s before "giving up" and emitting an empty matches list.
+         QVERIFY(timer.elapsed() >= 250);
+@@ -84,20 +85,18 @@ private Q_SLOTS:
+         QCOMPARE(spyQueryFinished.count(), 1); // Still the same, query is not done
+ 
+         // We programmed it to emit the result after 300ms, so we need to wait 50ms more for the next emission
+-        QVERIFY(spyQueryFinished.wait(100)); // 100ms as a margin of safety for 50ms
++        QVERIFY(spyQueryFinished.wait());
+ 
+         // This should have taken at least 300ms total, as we requested via the special query string
+         QVERIFY(timer.elapsed() >= 300);
+ 
+-        // RunnerManager::jobDone() should have anticipated the final emission, so it should not have waited the full 250+250 ms.
+-        QVERIFY(timer.elapsed() <= 330); // This total should be just a tad bigger than 300ms, we put a 10% margin of safety
+-
++        // At this point RunnerManager::jobDone() should have anticipated the final emission.
+         QCOMPARE(spyMatchesChanged.count(), 2); // We had the second matchesChanged emission, now with the query result
+         QCOMPARE(manager->matches().count(), 1); // The result is here
+         QCOMPARE(spyQueryFinished.count(), 2); // Will have emited queryFinished, job is done
+ 
+         // Now we will make sure that RunnerManager::scheduleMatchesChanged() emits matchesChanged instantly
+-        // if we start a query with an empty string. It will never produce results, stalling is meaninless
++        // if we start a query with an empty string. It will never produce results, stalling is meaningless
+         manager->launchQuery("");
+         QCOMPARE(spyMatchesChanged.count(), 3); // One more, instantly, without stall
+         QCOMPARE(manager->matches().count(), 0); // Empty results for empty query string
+-- 
+GitLab
+
diff --git a/kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch b/kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch
new file mode 100644
index 000000000000..7a586598c15e
--- /dev/null
+++ b/kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch
@@ -0,0 +1,26 @@
+From c1f589a7cda3a5d47479ab1188716df533ceb8b1 Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sun, 13 Mar 2022 13:08:26 +0100
+Subject: [PATCH] autotests: urgh, this test is really timing dependent, and
+ fails if CI is slow
+
+---
+ autotests/runnermanagertest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/autotests/runnermanagertest.cpp b/autotests/runnermanagertest.cpp
+index b9ccbc5..02c0985 100644
+--- a/autotests/runnermanagertest.cpp
++++ b/autotests/runnermanagertest.cpp
+@@ -84,7 +84,7 @@ private Q_SLOTS:
+         QCOMPARE(spyQueryFinished.count(), 1); // Still the same, query is not done
+ 
+         // We programmed it to emit the result after 300ms, so we need to wait 50ms more for the next emission
+-        QVERIFY(spyQueryFinished.wait(65)); // 65ms as a margin of safety for 50ms
++        QVERIFY(spyQueryFinished.wait(100)); // 100ms as a margin of safety for 50ms
+ 
+         // This should have taken at least 300ms total, as we requested via the special query string
+         QVERIFY(timer.elapsed() >= 300);
+-- 
+GitLab
+
diff --git a/kde-frameworks/krunner/krunner-5.90.0.ebuild b/kde-frameworks/krunner/krunner-5.90.0.ebuild
deleted file mode 100644
index 2d41cc747458..000000000000
--- a/kde-frameworks/krunner/krunner-5.90.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
-
-DESCRIPTION="Framework for providing different actions given a string query"
-
-LICENSE="LGPL-2+"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="activities"
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	=kde-frameworks/kconfig-${PVCUT}*:5
-	=kde-frameworks/kcoreaddons-${PVCUT}*:5
-	=kde-frameworks/ki18n-${PVCUT}*:5
-	=kde-frameworks/kio-${PVCUT}*:5
-	=kde-frameworks/kservice-${PVCUT}*:5
-	=kde-frameworks/plasma-${PVCUT}*:5
-	=kde-frameworks/solid-${PVCUT}*:5
-	=kde-frameworks/threadweaver-${PVCUT}*:5
-	activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package activities KF5Activities)
-	)
-	ecm_src_configure
-}
-
-src_test() {
-	# requires virtual dbus, otherwise hangs; bugs #630672, #789351
-	local myctestargs=(
-		-E "(dbusrunnertest|runnermanagersinglerunnermodetest)"
-	)
-	ecm_src_test
-}
diff --git a/kde-frameworks/krunner/krunner-5.92.0.ebuild b/kde-frameworks/krunner/krunner-5.92.0.ebuild
index 2f9c5b2e8930..366bf81f3078 100644
--- a/kde-frameworks/krunner/krunner-5.92.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.92.0.ebuild
@@ -11,7 +11,7 @@ inherit ecm kde.org
 DESCRIPTION="Framework for providing different actions given a string query"
 
 LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="activities"
 
 DEPEND="
@@ -31,6 +31,11 @@ DEPEND="
 "
 RDEPEND="${DEPEND}"
 
+PATCHES=(
+	"${FILESDIR}/${P}-increase-runnermanagertest-timeout.patch"
+	"${FILESDIR}/${P}-drop-runnermanagertest-timeouts.patch"
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package activities KF5Activities)
@@ -39,9 +44,9 @@ src_configure() {
 }
 
 src_test() {
-	# requires virtual dbus, otherwise hangs; bugs #630672, #789351
+	# requires virtual dbus, otherwise hangs; bugs #630672, #789351, #838502
 	local myctestargs=(
-		-E "(dbusrunnertest|runnermanagersinglerunnermodetest)"
+		-E "(dbusrunnertest|runnermanagersinglerunnermodetest|runnermanagertest)"
 	)
 	ecm_src_test
 }