[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/krunner/files/, kde-frameworks/krunner/

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/krunner/files/, kde-frameworks/krunner/

[Andreas Sturmlechner]

commit:     4b7d053f0d6dee004a42b4c148205a6e0b16910f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 14 21:19:00 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Jul 14 21:19:03 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b7d053f

kde-frameworks/krunner: Backport crashfix

See also: https://mail.kde.org/pipermail/kde-distro-packagers/2020-July/000427.html
KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=423003
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../krunner/files/krunner-5.72.0-fix-vtable.patch  | 54 ++++++++++++++++++++++
 kde-frameworks/krunner/krunner-5.72.0-r1.ebuild    | 40 ++++++++++++++++
 2 files changed, 94 insertions(+)

diff --git a/kde-frameworks/krunner/files/krunner-5.72.0-fix-vtable.patch b/kde-frameworks/krunner/files/krunner-5.72.0-fix-vtable.patch
new file mode 100644
index 00000000000..88f629721fc
--- /dev/null
+++ b/kde-frameworks/krunner/files/krunner-5.72.0-fix-vtable.patch
@@ -0,0 +1,54 @@
+From 8f7ce559b84ee0c21de0256e6591793e4b95f411 Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Tue, 14 Jul 2020 13:02:51 +0200
+Subject: [PATCH] Do not remove virtual method from build
+
+Method was deprecated in fc5738ab7c4025a87e2bbd656914b6187df7a9eb. Removing the
+method when building without deprecated methods (for example the pim runner
+does this) changes the vtable leading to crashes.
+BUG: 423003
+---
+ src/abstractrunner.cpp | 2 --
+ src/abstractrunner.h   | 2 --
+ 2 files changed, 4 deletions(-)
+
+diff --git a/src/abstractrunner.cpp b/src/abstractrunner.cpp
+index 378c73d..34c44d1 100644
+--- a/src/abstractrunner.cpp
++++ b/src/abstractrunner.cpp
+@@ -244,12 +244,10 @@ void AbstractRunner::setHasRunOptions(bool hasRunOptions)
+ }
+ #endif
+ 
+-#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71)
+ void AbstractRunner::createRunOptions(QWidget *parent)
+ {
+     Q_UNUSED(parent)
+ }
+-#endif
+ 
+ AbstractRunner::Speed AbstractRunner::speed() const
+ {
+diff --git a/src/abstractrunner.h b/src/abstractrunner.h
+index cb4e32a..ae9558d 100644
+--- a/src/abstractrunner.h
++++ b/src/abstractrunner.h
+@@ -161,7 +161,6 @@ class KRUNNER_EXPORT AbstractRunner : public QObject
+         bool hasRunOptions();
+ #endif
+ 
+-#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71)
+         /**
+          * If hasRunOptions() returns true, this method may be called to get
+          * a widget displaying the options the user can interact with to modify
+@@ -172,7 +171,6 @@ class KRUNNER_EXPORT AbstractRunner : public QObject
+          */
+         KRUNNER_DEPRECATED_VERSION_BELATED(5, 71,  5, 0, "No longer use, feature removed")
+         virtual void createRunOptions(QWidget *widget);
+-#endif
+ 
+         /**
+          * Called whenever an exact or possible match associated with this
+-- 
+GitLab
+

diff --git a/kde-frameworks/krunner/krunner-5.72.0-r1.ebuild b/kde-frameworks/krunner/krunner-5.72.0-r1.ebuild
new file mode 100644
index 00000000000..4a7eb63b541
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.72.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PVCUT=$(ver_cut 1-2)
+QTMIN=5.14.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 ~x86"
+IUSE=""
+
+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
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-fix-vtable.patch" )
+
+src_test() {
+	# requires virtual dbus #630672
+	local myctestargs=(
+		-E "(dbusrunnertest)"
+	)
+	ecm_src_test
+}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/krunner/files/, kde-frameworks/krunner/

[Andreas Sturmlechner]

commit:     dd312689b5ea3b3e04a817d53528f3b01a273b6f
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Aug  8 11:03:53 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Aug  8 19:55:33 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd312689

kde-frameworks/krunner: drop 5.72.0*

Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 kde-frameworks/krunner/Manifest                    |  1 -
 .../krunner/files/krunner-5.72.0-fix-vtable.patch  | 54 ----------------------
 kde-frameworks/krunner/krunner-5.72.0-r1.ebuild    | 40 ----------------
 3 files changed, 95 deletions(-)

diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index 9ead70ab005..3a6ef13a015 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,3 +1,2 @@
 DIST krunner-5.70.0.tar.xz 64184 BLAKE2B 97672bc5edb81231a9beaac67d3483ee6e76ed7a40b9dc95cbacfbd87a98fd62e939dadf639d0f17534daaee84ffedbca8693d8357bc46133be14ecaba0837da SHA512 861492f7106bc4f2f392e28f3ae7b61773d37d58d26b73a67c4410e2406c96e58183c584b18a24d7f9f41ec3165337d37e4616063365d65a635e07d64e18909c
-DIST krunner-5.72.0.tar.xz 66820 BLAKE2B de73761e0e792bbc545e15e8d80b345ab0e24d04e28b21d3d50f55284cb7d5c22e040d0f4e4b20e5229f70b99e397e60579b8aa241305681b91d8a3e89073658 SHA512 60102796a301d839ee29724111f1ef22a0b6b1bf7bf11d5952d219106ef38dd4278dbadd05043814c3d2d5b619c68252d9de46631a9bb6577cfd0a2e8ada2547
 DIST krunner-5.73.0.tar.xz 67340 BLAKE2B af2bf5078b27461e4cdb30ca4c8d751f1913ebddd18bf1be370659dd811ae201930f99e53f28968b10bb329ce8b248477c32d94fb03c2c43321091bcb0e50378 SHA512 e148d54ea1b517c8e54c769c0f5cf0d54704df86b63214393e6fe4404a3f34069f3bb2888eab9789257660d3170a73bfe8a2862dd4e9ad9506c9fa0bd1365de9

diff --git a/kde-frameworks/krunner/files/krunner-5.72.0-fix-vtable.patch b/kde-frameworks/krunner/files/krunner-5.72.0-fix-vtable.patch
deleted file mode 100644
index 88f629721fc..00000000000
--- a/kde-frameworks/krunner/files/krunner-5.72.0-fix-vtable.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8f7ce559b84ee0c21de0256e6591793e4b95f411 Mon Sep 17 00:00:00 2001
-From: David Redondo <kde@david-redondo.de>
-Date: Tue, 14 Jul 2020 13:02:51 +0200
-Subject: [PATCH] Do not remove virtual method from build
-
-Method was deprecated in fc5738ab7c4025a87e2bbd656914b6187df7a9eb. Removing the
-method when building without deprecated methods (for example the pim runner
-does this) changes the vtable leading to crashes.
-BUG: 423003
----
- src/abstractrunner.cpp | 2 --
- src/abstractrunner.h   | 2 --
- 2 files changed, 4 deletions(-)
-
-diff --git a/src/abstractrunner.cpp b/src/abstractrunner.cpp
-index 378c73d..34c44d1 100644
---- a/src/abstractrunner.cpp
-+++ b/src/abstractrunner.cpp
-@@ -244,12 +244,10 @@ void AbstractRunner::setHasRunOptions(bool hasRunOptions)
- }
- #endif
- 
--#if KRUNNER_BUILD_DEPRECATED_SINCE(5, 71)
- void AbstractRunner::createRunOptions(QWidget *parent)
- {
-     Q_UNUSED(parent)
- }
--#endif
- 
- AbstractRunner::Speed AbstractRunner::speed() const
- {
-diff --git a/src/abstractrunner.h b/src/abstractrunner.h
-index cb4e32a..ae9558d 100644
---- a/src/abstractrunner.h
-+++ b/src/abstractrunner.h
-@@ -161,7 +161,6 @@ class KRUNNER_EXPORT AbstractRunner : public QObject
-         bool hasRunOptions();
- #endif
- 
--#if KRUNNER_ENABLE_DEPRECATED_SINCE(5, 71)
-         /**
-          * If hasRunOptions() returns true, this method may be called to get
-          * a widget displaying the options the user can interact with to modify
-@@ -172,7 +171,6 @@ class KRUNNER_EXPORT AbstractRunner : public QObject
-          */
-         KRUNNER_DEPRECATED_VERSION_BELATED(5, 71,  5, 0, "No longer use, feature removed")
-         virtual void createRunOptions(QWidget *widget);
--#endif
- 
-         /**
-          * Called whenever an exact or possible match associated with this
--- 
-GitLab
-

diff --git a/kde-frameworks/krunner/krunner-5.72.0-r1.ebuild b/kde-frameworks/krunner/krunner-5.72.0-r1.ebuild
deleted file mode 100644
index 4a7eb63b541..00000000000
--- a/kde-frameworks/krunner/krunner-5.72.0-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PVCUT=$(ver_cut 1-2)
-QTMIN=5.14.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 ~x86"
-IUSE=""
-
-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
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-fix-vtable.patch" )
-
-src_test() {
-	# requires virtual dbus #630672
-	local myctestargs=(
-		-E "(dbusrunnertest)"
-	)
-	ecm_src_test
-}

[gentoo-commits] repo/gentoo:master commit in: kde-frameworks/krunner/files/, kde-frameworks/krunner/

[Andreas Sturmlechner]

commit:     08a1fe0c24a75683febdfa101705550052bff99d
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 18 20:36:58 2022 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Apr 18 20:37:14 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08a1fe0c

kde-frameworks/krunner: Try to fix runnermanagertest

Bug: https://bugs.gentoo.org/838502
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 ...er-5.92.0-drop-runnermanagertest-timeouts.patch | 55 ++++++++++++++++++++++
 ...5.92.0-increase-runnermanagertest-timeout.patch | 26 ++++++++++
 kde-frameworks/krunner/krunner-5.92.0.ebuild       |  5 ++
 3 files changed, 86 insertions(+)

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.92.0.ebuild b/kde-frameworks/krunner/krunner-5.92.0.ebuild
index 2f9c5b2e8930..27d1116f2d8a 100644
--- a/kde-frameworks/krunner/krunner-5.92.0.ebuild
+++ b/kde-frameworks/krunner/krunner-5.92.0.ebuild
@@ -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)