summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2022-08-06 08:59:14 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2022-08-06 09:18:48 +0200
commit3a72e1446dde638557c7e8e83435f5faae3f4e44 (patch)
tree47a014ae06f6461e59387a46fd785bd04bb10eea
parentkde-frameworks/kparts: drop 5.92.0 (diff)
downloadgentoo-3a72e1446dde638557c7e8e83435f5faae3f4e44.tar.gz
gentoo-3a72e1446dde638557c7e8e83435f5faae3f4e44.tar.bz2
gentoo-3a72e1446dde638557c7e8e83435f5faae3f4e44.zip
kde-frameworks/krunner: drop 5.92.0
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-frameworks/krunner/Manifest1
-rw-r--r--kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch55
-rw-r--r--kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch26
-rw-r--r--kde-frameworks/krunner/krunner-5.92.0.ebuild52
4 files changed, 0 insertions, 134 deletions
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index dcd1f5464a7a..07126efeea36 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,2 +1 @@
-DIST krunner-5.92.0.tar.xz 86108 BLAKE2B 570e67bac19646d7107c55dd607fda359334e3fe4cb72c6c80235b03f91e238f814b93486d9d3668880a2aed9d3a8bc2b6e518ac71e29943b0fd476235360052 SHA512 7959d1a7f55b6c2d55f2e4e65aef11d5a5cdf5e7b7bf5b702d1da4ed02c8e05a3c36dc5e70bfa443303863d98dc0cc7c418ebc46cbf68fad5baed4f2389bce35
DIST krunner-5.96.0.tar.xz 87452 BLAKE2B f9a81bb88fc0d02d8458b01fde2e55cc6c9042e9d33d29603f3f3a38165bcd0a6e7e590614a4d92f59f0d741f4995614cdce726a7f72521445f9cb88aa865678 SHA512 fb25fdd554d56ee5b3b5b31a2feae1df8f37e1c434101eda957548b954b99e13cf25be46e03a43b73771ed7935750228b2957d654e06cd5e810353ccd264ed48
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
deleted file mode 100644
index 1d6c654f631e..000000000000
--- a/kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-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
deleted file mode 100644
index 7a586598c15e..000000000000
--- a/kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-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.92.0.ebuild b/kde-frameworks/krunner/krunner-5.92.0.ebuild
deleted file mode 100644
index 366bf81f3078..000000000000
--- a/kde-frameworks/krunner/krunner-5.92.0.ebuild
+++ /dev/null
@@ -1,52 +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}"
-
-PATCHES=(
- "${FILESDIR}/${P}-increase-runnermanagertest-timeout.patch"
- "${FILESDIR}/${P}-drop-runnermanagertest-timeouts.patch"
-)
-
-src_configure() {
- local mycmakeargs=(
- $(cmake_use_find_package activities KF5Activities)
- )
- ecm_src_configure
-}
-
-src_test() {
- # requires virtual dbus, otherwise hangs; bugs #630672, #789351, #838502
- local myctestargs=(
- -E "(dbusrunnertest|runnermanagersinglerunnermodetest|runnermanagertest)"
- )
- ecm_src_test
-}