1 |
commit: a61d404f0f2f976a648be4bc6a3c872f7a71f1a4 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun May 30 15:38:44 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun May 30 15:51:27 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a61d404f |
7 |
|
8 |
kde-frameworks/kio: filenamesearch crashes in KCoreDirLister |
9 |
|
10 |
Upstream commit a38fcf356de0cbba1ce97c8ef70979ed897a8094 |
11 |
|
12 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=437153 |
13 |
Package-Manager: Portage-3.0.19, Repoman-3.0.3 |
14 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
15 |
|
16 |
.../kio-5.82.0-fix-filenamesearch-crashes.patch | 28 ++++++ |
17 |
kde-frameworks/kio/kio-5.82.0-r2.ebuild | 111 +++++++++++++++++++++ |
18 |
2 files changed, 139 insertions(+) |
19 |
|
20 |
diff --git a/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch |
21 |
new file mode 100644 |
22 |
index 00000000000..b92139a5187 |
23 |
--- /dev/null |
24 |
+++ b/kde-frameworks/kio/files/kio-5.82.0-fix-filenamesearch-crashes.patch |
25 |
@@ -0,0 +1,28 @@ |
26 |
+From a38fcf356de0cbba1ce97c8ef70979ed897a8094 Mon Sep 17 00:00:00 2001 |
27 |
+From: Kai Uwe Broulik <kde@××××××××××××××.de> |
28 |
+Date: Tue, 18 May 2021 19:54:54 +0200 |
29 |
+Subject: [PATCH] [KCoreDirLister] Guard uiDelegate(), it might be null |
30 |
+ |
31 |
+BUG: 437153 |
32 |
+--- |
33 |
+ src/core/kcoredirlister.cpp | 4 +++- |
34 |
+ 1 file changed, 3 insertions(+), 1 deletion(-) |
35 |
+ |
36 |
+diff --git a/src/core/kcoredirlister.cpp b/src/core/kcoredirlister.cpp |
37 |
+index a836f0aa..58d8791c 100644 |
38 |
+--- a/src/core/kcoredirlister.cpp |
39 |
++++ b/src/core/kcoredirlister.cpp |
40 |
+@@ -1288,7 +1288,9 @@ void KCoreDirListerCache::slotResult(KJob *j) |
41 |
+ Q_EMIT kdl->jobError(job); |
42 |
+ if (kdl->d->m_autoErrorHandling && !errorShown) { |
43 |
+ errorShown = true; // do it only once |
44 |
+- job->uiDelegate()->showErrorMessage(); |
45 |
++ if (job->uiDelegate()) { |
46 |
++ job->uiDelegate()->showErrorMessage(); |
47 |
++ } |
48 |
+ } |
49 |
+ #if KIOCORE_BUILD_DEPRECATED_SINCE(5, 82) |
50 |
+ kdl->handleError(job); |
51 |
+-- |
52 |
+2.31.1 |
53 |
+ |
54 |
|
55 |
diff --git a/kde-frameworks/kio/kio-5.82.0-r2.ebuild b/kde-frameworks/kio/kio-5.82.0-r2.ebuild |
56 |
new file mode 100644 |
57 |
index 00000000000..79d4c76e5a5 |
58 |
--- /dev/null |
59 |
+++ b/kde-frameworks/kio/kio-5.82.0-r2.ebuild |
60 |
@@ -0,0 +1,111 @@ |
61 |
+# Copyright 1999-2021 Gentoo Authors |
62 |
+# Distributed under the terms of the GNU General Public License v2 |
63 |
+ |
64 |
+EAPI=7 |
65 |
+ |
66 |
+ECM_DESIGNERPLUGIN="true" |
67 |
+ECM_TEST="forceoptional" |
68 |
+PVCUT=$(ver_cut 1-2) |
69 |
+QTMIN=5.15.2 |
70 |
+VIRTUALX_REQUIRED="test" |
71 |
+inherit ecm kde.org xdg-utils |
72 |
+ |
73 |
+DESCRIPTION="Framework providing transparent file and data management" |
74 |
+ |
75 |
+LICENSE="LGPL-2+" |
76 |
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" |
77 |
+IUSE="acl +handbook kerberos +kwallet X" |
78 |
+ |
79 |
+# tests hang |
80 |
+RESTRICT+=" test" |
81 |
+ |
82 |
+RDEPEND=" |
83 |
+ dev-libs/libxml2 |
84 |
+ dev-libs/libxslt |
85 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
86 |
+ >=dev-qt/qtdeclarative-${QTMIN}:5 |
87 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
88 |
+ >=dev-qt/qtnetwork-${QTMIN}:5[ssl] |
89 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
90 |
+ >=dev-qt/qtxml-${QTMIN}:5 |
91 |
+ =kde-frameworks/kauth-${PVCUT}*:5 |
92 |
+ =kde-frameworks/karchive-${PVCUT}*:5 |
93 |
+ =kde-frameworks/kbookmarks-${PVCUT}*:5 |
94 |
+ =kde-frameworks/kcodecs-${PVCUT}*:5 |
95 |
+ =kde-frameworks/kcompletion-${PVCUT}*:5 |
96 |
+ =kde-frameworks/kconfig-${PVCUT}*:5 |
97 |
+ =kde-frameworks/kconfigwidgets-${PVCUT}*:5 |
98 |
+ =kde-frameworks/kcoreaddons-${PVCUT}*:5 |
99 |
+ =kde-frameworks/kcrash-${PVCUT}*:5 |
100 |
+ =kde-frameworks/kdbusaddons-${PVCUT}*:5 |
101 |
+ =kde-frameworks/kguiaddons-${PVCUT}*:5 |
102 |
+ =kde-frameworks/ki18n-${PVCUT}*:5 |
103 |
+ =kde-frameworks/kiconthemes-${PVCUT}*:5 |
104 |
+ =kde-frameworks/kitemviews-${PVCUT}*:5 |
105 |
+ =kde-frameworks/kjobwidgets-${PVCUT}*:5 |
106 |
+ =kde-frameworks/knotifications-${PVCUT}*:5 |
107 |
+ =kde-frameworks/kservice-${PVCUT}*:5 |
108 |
+ =kde-frameworks/ktextwidgets-${PVCUT}*:5 |
109 |
+ =kde-frameworks/kwidgetsaddons-${PVCUT}*:5 |
110 |
+ =kde-frameworks/kwindowsystem-${PVCUT}*:5 |
111 |
+ =kde-frameworks/kxmlgui-${PVCUT}*:5 |
112 |
+ =kde-frameworks/solid-${PVCUT}*:5 |
113 |
+ acl? ( |
114 |
+ sys-apps/attr |
115 |
+ virtual/acl |
116 |
+ ) |
117 |
+ handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 ) |
118 |
+ kerberos? ( virtual/krb5 ) |
119 |
+ kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 ) |
120 |
+ X? ( >=dev-qt/qtx11extras-${QTMIN}:5 ) |
121 |
+" |
122 |
+DEPEND="${RDEPEND} |
123 |
+ >=dev-qt/qtconcurrent-${QTMIN}:5 |
124 |
+ test? ( sys-libs/zlib ) |
125 |
+ X? ( |
126 |
+ x11-base/xorg-proto |
127 |
+ x11-libs/libX11 |
128 |
+ x11-libs/libXrender |
129 |
+ ) |
130 |
+" |
131 |
+PDEPEND=" |
132 |
+ >=kde-frameworks/kded-${PVCUT}:5 |
133 |
+" |
134 |
+ |
135 |
+PATCHES=( |
136 |
+ # pending https://invent.kde.org/frameworks/kio/-/merge_requests/426 |
137 |
+ "${FILESDIR}"/${PN}-5.81.0-fix-qtconcurrent-private-link.patch # bug 784971 |
138 |
+ # upstream backport request - see also KDE-bug 398908 |
139 |
+ "${FILESDIR}"/${P}-MimeTypeFinderJob-memleak-{1,2,3,4}.patch |
140 |
+ "${FILESDIR}"/${P}-fix-filenamesearch-crashes.patch # KDE-bug 437153 |
141 |
+ # git master/KIO 5.83: |
142 |
+ "${FILESDIR}"/${P}-no-useragent-kcm.patch |
143 |
+ "${FILESDIR}"/${P}-no-cache-kcm.patch |
144 |
+) |
145 |
+ |
146 |
+src_prepare() { |
147 |
+ ecm_src_prepare |
148 |
+ rm -rf po/*/docs/kcontrol5/{cache,useragent} || die # superfluous docs |
149 |
+} |
150 |
+ |
151 |
+src_configure() { |
152 |
+ local mycmakeargs=( |
153 |
+ $(cmake_use_find_package acl ACL) |
154 |
+ $(cmake_use_find_package handbook KF5DocTools) |
155 |
+ $(cmake_use_find_package kerberos GSSAPI) |
156 |
+ $(cmake_use_find_package kwallet KF5Wallet) |
157 |
+ $(cmake_use_find_package X X11) |
158 |
+ ) |
159 |
+ |
160 |
+ ecm_src_configure |
161 |
+} |
162 |
+ |
163 |
+pkg_postinst() { |
164 |
+ ecm_pkg_postinst |
165 |
+ xdg_desktop_database_update |
166 |
+} |
167 |
+ |
168 |
+pkg_postrm() { |
169 |
+ ecm_pkg_postrm |
170 |
+ xdg_desktop_database_update |
171 |
+} |