Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-frameworks/krunner/, kde-frameworks/krunner/files/
Date: Sat, 06 Aug 2022 07:45:03
Message-Id: 1659770328.3a72e1446dde638557c7e8e83435f5faae3f4e44.asturm@gentoo
1 commit: 3a72e1446dde638557c7e8e83435f5faae3f4e44
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 6 06:59:14 2022 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 6 07:18:48 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3a72e144
7
8 kde-frameworks/krunner: drop 5.92.0
9
10 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
11
12 kde-frameworks/krunner/Manifest | 1 -
13 ...er-5.92.0-drop-runnermanagertest-timeouts.patch | 55 ----------------------
14 ...5.92.0-increase-runnermanagertest-timeout.patch | 26 ----------
15 kde-frameworks/krunner/krunner-5.92.0.ebuild | 52 --------------------
16 4 files changed, 134 deletions(-)
17
18 diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
19 index dcd1f5464a7a..07126efeea36 100644
20 --- a/kde-frameworks/krunner/Manifest
21 +++ b/kde-frameworks/krunner/Manifest
22 @@ -1,2 +1 @@
23 -DIST krunner-5.92.0.tar.xz 86108 BLAKE2B 570e67bac19646d7107c55dd607fda359334e3fe4cb72c6c80235b03f91e238f814b93486d9d3668880a2aed9d3a8bc2b6e518ac71e29943b0fd476235360052 SHA512 7959d1a7f55b6c2d55f2e4e65aef11d5a5cdf5e7b7bf5b702d1da4ed02c8e05a3c36dc5e70bfa443303863d98dc0cc7c418ebc46cbf68fad5baed4f2389bce35
24 DIST krunner-5.96.0.tar.xz 87452 BLAKE2B f9a81bb88fc0d02d8458b01fde2e55cc6c9042e9d33d29603f3f3a38165bcd0a6e7e590614a4d92f59f0d741f4995614cdce726a7f72521445f9cb88aa865678 SHA512 fb25fdd554d56ee5b3b5b31a2feae1df8f37e1c434101eda957548b954b99e13cf25be46e03a43b73771ed7935750228b2957d654e06cd5e810353ccd264ed48
25
26 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
27 deleted file mode 100644
28 index 1d6c654f631e..000000000000
29 --- a/kde-frameworks/krunner/files/krunner-5.92.0-drop-runnermanagertest-timeouts.patch
30 +++ /dev/null
31 @@ -1,55 +0,0 @@
32 -From f324dd5fc477888517db7b431bc291d0712969af Mon Sep 17 00:00:00 2001
33 -From: Eduardo de Souza Cruz <eduardo.cruz@×××××××.net>
34 -Date: Mon, 14 Mar 2022 14:12:17 -0300
35 -Subject: [PATCH] Remove upper-limits for RunnerManagerTest's timeouts
36 -
37 -Those upper-limits timeouts were not conservative enough for the Continuous Integration environment which can be slow and this test was failing sometimes.
38 -
39 -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.
40 ----
41 - autotests/runnermanagertest.cpp | 13 ++++++-------
42 - 1 file changed, 6 insertions(+), 7 deletions(-)
43 -
44 -diff --git a/autotests/runnermanagertest.cpp b/autotests/runnermanagertest.cpp
45 -index 02c0985..82bd2a4 100644
46 ---- a/autotests/runnermanagertest.cpp
47 -+++ b/autotests/runnermanagertest.cpp
48 -@@ -74,8 +74,9 @@ private Q_SLOTS:
49 - // However not yet a matcheschanged, it should be stalled for 250ms
50 - QCOMPARE(spyMatchesChanged.count(), 0);
51 -
52 -- // After 250ms it will emit with empty matches, we wait for that
53 -- QVERIFY(spyMatchesChanged.wait(265)); // 265ms as a margin of safety for 250ms
54 -+ // After 250ms it will emit with empty matches, we wait for that.
55 -+ // We can't put a low upper limit on these wait() calls because the CI environment can be slow.
56 -+ QVERIFY(spyMatchesChanged.wait()); // This should take just a tad longer than 250ms.
57 -
58 - // This should have taken no less than 250ms. It waits for 250s before "giving up" and emitting an empty matches list.
59 - QVERIFY(timer.elapsed() >= 250);
60 -@@ -84,20 +85,18 @@ private Q_SLOTS:
61 - QCOMPARE(spyQueryFinished.count(), 1); // Still the same, query is not done
62 -
63 - // We programmed it to emit the result after 300ms, so we need to wait 50ms more for the next emission
64 -- QVERIFY(spyQueryFinished.wait(100)); // 100ms as a margin of safety for 50ms
65 -+ QVERIFY(spyQueryFinished.wait());
66 -
67 - // This should have taken at least 300ms total, as we requested via the special query string
68 - QVERIFY(timer.elapsed() >= 300);
69 -
70 -- // RunnerManager::jobDone() should have anticipated the final emission, so it should not have waited the full 250+250 ms.
71 -- QVERIFY(timer.elapsed() <= 330); // This total should be just a tad bigger than 300ms, we put a 10% margin of safety
72 --
73 -+ // At this point RunnerManager::jobDone() should have anticipated the final emission.
74 - QCOMPARE(spyMatchesChanged.count(), 2); // We had the second matchesChanged emission, now with the query result
75 - QCOMPARE(manager->matches().count(), 1); // The result is here
76 - QCOMPARE(spyQueryFinished.count(), 2); // Will have emited queryFinished, job is done
77 -
78 - // Now we will make sure that RunnerManager::scheduleMatchesChanged() emits matchesChanged instantly
79 -- // if we start a query with an empty string. It will never produce results, stalling is meaninless
80 -+ // if we start a query with an empty string. It will never produce results, stalling is meaningless
81 - manager->launchQuery("");
82 - QCOMPARE(spyMatchesChanged.count(), 3); // One more, instantly, without stall
83 - QCOMPARE(manager->matches().count(), 0); // Empty results for empty query string
84 ---
85 -GitLab
86 -
87
88 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
89 deleted file mode 100644
90 index 7a586598c15e..000000000000
91 --- a/kde-frameworks/krunner/files/krunner-5.92.0-increase-runnermanagertest-timeout.patch
92 +++ /dev/null
93 @@ -1,26 +0,0 @@
94 -From c1f589a7cda3a5d47479ab1188716df533ceb8b1 Mon Sep 17 00:00:00 2001
95 -From: David Faure <faure@×××.org>
96 -Date: Sun, 13 Mar 2022 13:08:26 +0100
97 -Subject: [PATCH] autotests: urgh, this test is really timing dependent, and
98 - fails if CI is slow
99 -
100 ----
101 - autotests/runnermanagertest.cpp | 2 +-
102 - 1 file changed, 1 insertion(+), 1 deletion(-)
103 -
104 -diff --git a/autotests/runnermanagertest.cpp b/autotests/runnermanagertest.cpp
105 -index b9ccbc5..02c0985 100644
106 ---- a/autotests/runnermanagertest.cpp
107 -+++ b/autotests/runnermanagertest.cpp
108 -@@ -84,7 +84,7 @@ private Q_SLOTS:
109 - QCOMPARE(spyQueryFinished.count(), 1); // Still the same, query is not done
110 -
111 - // We programmed it to emit the result after 300ms, so we need to wait 50ms more for the next emission
112 -- QVERIFY(spyQueryFinished.wait(65)); // 65ms as a margin of safety for 50ms
113 -+ QVERIFY(spyQueryFinished.wait(100)); // 100ms as a margin of safety for 50ms
114 -
115 - // This should have taken at least 300ms total, as we requested via the special query string
116 - QVERIFY(timer.elapsed() >= 300);
117 ---
118 -GitLab
119 -
120
121 diff --git a/kde-frameworks/krunner/krunner-5.92.0.ebuild b/kde-frameworks/krunner/krunner-5.92.0.ebuild
122 deleted file mode 100644
123 index 366bf81f3078..000000000000
124 --- a/kde-frameworks/krunner/krunner-5.92.0.ebuild
125 +++ /dev/null
126 @@ -1,52 +0,0 @@
127 -# Copyright 1999-2022 Gentoo Authors
128 -# Distributed under the terms of the GNU General Public License v2
129 -
130 -EAPI=8
131 -
132 -PVCUT=$(ver_cut 1-2)
133 -QTMIN=5.15.2
134 -VIRTUALX_REQUIRED="test"
135 -inherit ecm kde.org
136 -
137 -DESCRIPTION="Framework for providing different actions given a string query"
138 -
139 -LICENSE="LGPL-2+"
140 -KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
141 -IUSE="activities"
142 -
143 -DEPEND="
144 - >=dev-qt/qtdbus-${QTMIN}:5
145 - >=dev-qt/qtdeclarative-${QTMIN}:5
146 - >=dev-qt/qtgui-${QTMIN}:5
147 - >=dev-qt/qtwidgets-${QTMIN}:5
148 - =kde-frameworks/kconfig-${PVCUT}*:5
149 - =kde-frameworks/kcoreaddons-${PVCUT}*:5
150 - =kde-frameworks/ki18n-${PVCUT}*:5
151 - =kde-frameworks/kio-${PVCUT}*:5
152 - =kde-frameworks/kservice-${PVCUT}*:5
153 - =kde-frameworks/plasma-${PVCUT}*:5
154 - =kde-frameworks/solid-${PVCUT}*:5
155 - =kde-frameworks/threadweaver-${PVCUT}*:5
156 - activities? ( =kde-frameworks/kactivities-${PVCUT}*:5 )
157 -"
158 -RDEPEND="${DEPEND}"
159 -
160 -PATCHES=(
161 - "${FILESDIR}/${P}-increase-runnermanagertest-timeout.patch"
162 - "${FILESDIR}/${P}-drop-runnermanagertest-timeouts.patch"
163 -)
164 -
165 -src_configure() {
166 - local mycmakeargs=(
167 - $(cmake_use_find_package activities KF5Activities)
168 - )
169 - ecm_src_configure
170 -}
171 -
172 -src_test() {
173 - # requires virtual dbus, otherwise hangs; bugs #630672, #789351, #838502
174 - local myctestargs=(
175 - -E "(dbusrunnertest|runnermanagersinglerunnermodetest|runnermanagertest)"
176 - )
177 - ecm_src_test
178 -}