[gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/, kde-apps/kate/files/

[Andreas Sturmlechner]

commit: 3267620079aacdcc9b7bfe8d7fa47e9734d16e23
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Fri Feb 12 21:23:46 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Fri Feb 12 21:23:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32676200

kde-apps/kate: Fix hanging test

Reported-by: Paolo Pedroni  iol.it>
Closes: https://bugs.gentoo.org/769548
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  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 000..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 
+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 
+-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
 

[gentoo-commits] repo/gentoo:master commit in: kde-apps/kate/, kde-apps/kate/files/

[Andreas Sturmlechner]

commit: d4d0c4474bd72d57f1f9584febb25cdb189b4c4c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Aug  6 19:01:42 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Aug  6 20:10:11 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d0c447

kde-apps/kate: Fix build error caused by missing header (Qt 5.12.4?)

Package-Manager: Portage-2.3.71, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../kate-19.04.3-qt-5.12.4-missing-header.patch| 23 ++
 kde-apps/kate/kate-19.04.3.ebuild  |  2 ++
 2 files changed, 25 insertions(+)

diff --git a/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch 
b/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch
new file mode 100644
index 000..3fd4147bd0f
--- /dev/null
+++ b/kde-apps/kate/files/kate-19.04.3-qt-5.12.4-missing-header.patch
@@ -0,0 +1,23 @@
+From fce700be7740704929c8bd64549ddf80774e4bda Mon Sep 17 00:00:00 2001
+From: Christoph Cullmann 
+Date: Thu, 18 Jul 2019 22:10:05 +0200
+Subject: add missing header
+
+---
+ kate/katemdi.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/kate/katemdi.cpp b/kate/katemdi.cpp
+index 495d1a5..8173ebe 100644
+--- a/kate/katemdi.cpp
 b/kate/katemdi.cpp
+@@ -43,6 +43,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ 
+ namespace KateMDI
+ {
+-- 
+cgit v1.1

diff --git a/kde-apps/kate/kate-19.04.3.ebuild 
b/kde-apps/kate/kate-19.04.3.ebuild
index ed64d1dc24a..b47fc1d5b38 100644
--- a/kde-apps/kate/kate-19.04.3.ebuild
+++ b/kde-apps/kate/kate-19.04.3.ebuild
@@ -53,6 +53,8 @@ RDEPEND="${DEPEND}
!kde-misc/ktexteditorpreviewplugin
 "
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.12.4-missing-header.patch" )
+
 src_prepare() {
kde5_src_prepare
# test hangs