commit: 3267620079aacdcc9b7bfe8d7fa47e9734d16e23 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Fri Feb 12 21:23:46 2021 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Fri Feb 12 21:23:46 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32676200
kde-apps/kate: Fix hanging test Reported-by: Paolo Pedroni <paolo.pedroni <AT> iol.it> Closes: https://bugs.gentoo.org/769548 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kate-20.08.3-fix-filetree_model_test.patch | 27 ++++++++++++++++++++++ kde-apps/kate/kate-20.08.3.ebuild | 6 ++++- kde-apps/kate/kate-20.12.2.ebuild | 4 ++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/kde-apps/kate/files/kate-20.08.3-fix-filetree_model_test.patch b/kde-apps/kate/files/kate-20.08.3-fix-filetree_model_test.patch new file mode 100644 index 00000000000..36eedd9c0a1 --- /dev/null +++ b/kde-apps/kate/files/kate-20.08.3-fix-filetree_model_test.patch @@ -0,0 +1,27 @@ +From 761b74416a513331359b327e033349a8da77daa8 Mon Sep 17 00:00:00 2001 +From: Ahmad Samir <a.samir...@gmail.com> +Date: Thu, 26 Nov 2020 14:12:30 +0200 +Subject: [PATCH] filetree addon: fix crash in filetree_model_test + +We can't use QTEST_GUILESS_MAIN since KateRendererConfig::setSchemaInternal() +uses QGuiApplication to get the current palette name. +--- + addons/filetree/autotests/filetree_model_test.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/addons/filetree/autotests/filetree_model_test.cpp b/addons/filetree/autotests/filetree_model_test.cpp +index 2ea8a0780..5c503328c 100644 +--- a/addons/filetree/autotests/filetree_model_test.cpp ++++ b/addons/filetree/autotests/filetree_model_test.cpp +@@ -9,7 +9,7 @@ + #include "document_dummy.h" + + #include <QtTest> +-QTEST_GUILESS_MAIN(FileTreeModelTest) ++QTEST_MAIN(FileTreeModelTest) + + // BEGIN ResultNode + class ResultNode +-- +GitLab + diff --git a/kde-apps/kate/kate-20.08.3.ebuild b/kde-apps/kate/kate-20.08.3.ebuild index 5c8f7359242..d6299f186d5 100644 --- a/kde-apps/kate/kate-20.08.3.ebuild +++ b/kde-apps/kate/kate-20.08.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -61,6 +61,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${P}-fix-filetree_model_test.patch" # bug 769548 +) + src_prepare() { ecm_src_prepare diff --git a/kde-apps/kate/kate-20.12.2.ebuild b/kde-apps/kate/kate-20.12.2.ebuild index aaf50d4fa88..47bc8aebbfa 100644 --- a/kde-apps/kate/kate-20.12.2.ebuild +++ b/kde-apps/kate/kate-20.12.2.ebuild @@ -61,6 +61,10 @@ DEPEND=" " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}/${PN}-20.08.3-fix-filetree_model_test.patch" # bug 769548 +) + src_prepare() { ecm_src_prepare
