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/kio/, kde-frameworks/kio/files/
Date: Wed, 23 Dec 2020 21:33:07
Message-Id: 1608759162.4aad45800cd19d30050ebc9eb5c39fe94ca4436c.asturm@gentoo
1 commit: 4aad45800cd19d30050ebc9eb5c39fe94ca4436c
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 23 21:16:41 2020 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 23 21:32:42 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4aad4580
7
8 kde-frameworks/kio: Crash fix
9
10 Upstream commit 9dc9e26b9196111eeacb5609b36957f74f5a14c4
11
12 See also: https://mail.kde.org/pipermail/distributions/2020-December/000913.html
13 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=430374
14 Package-Manager: Portage-3.0.12, Repoman-3.0.2
15 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
16
17 kde-frameworks/kio/files/kio-5.77.0-crashfix.patch | 29 +++++++
18 kde-frameworks/kio/kio-5.77.0-r1.ebuild | 96 ++++++++++++++++++++++
19 2 files changed, 125 insertions(+)
20
21 diff --git a/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch b/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch
22 new file mode 100644
23 index 00000000000..d24a0d976c0
24 --- /dev/null
25 +++ b/kde-frameworks/kio/files/kio-5.77.0-crashfix.patch
26 @@ -0,0 +1,29 @@
27 +From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001
28 +From: Ismael Asensio <isma.af@×××××.com>
29 +Date: Tue, 22 Dec 2020 22:23:17 +0100
30 +Subject: [PATCH] RenameDialog: Add missing nullptr initialization
31 +
32 +It fixes a crash when pressing `Apply to All` in those cases where
33 +the action was not present, as the code checks for nullptr
34 +
35 +BUG: 430374
36 +FIXED-IN: 5.78
37 +---
38 + src/widgets/renamedialog.cpp | 1 +
39 + 1 file changed, 1 insertion(+)
40 +
41 +diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
42 +index ac1d91d2..c3e04753 100644
43 +--- a/src/widgets/renamedialog.cpp
44 ++++ b/src/widgets/renamedialog.cpp
45 +@@ -161,6 +161,7 @@ public:
46 + bCancel = nullptr;
47 + bRename = bSkip = nullptr;
48 + bOverwrite = nullptr;
49 ++ bOverwriteWhenOlder = nullptr;
50 + bResume = bSuggestNewName = nullptr;
51 + bApplyAll = nullptr;
52 + m_pLineEdit = nullptr;
53 +--
54 +GitLab
55 +
56
57 diff --git a/kde-frameworks/kio/kio-5.77.0-r1.ebuild b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
58 new file mode 100644
59 index 00000000000..5089ee6dac2
60 --- /dev/null
61 +++ b/kde-frameworks/kio/kio-5.77.0-r1.ebuild
62 @@ -0,0 +1,96 @@
63 +# Copyright 1999-2020 Gentoo Authors
64 +# Distributed under the terms of the GNU General Public License v2
65 +
66 +EAPI=7
67 +
68 +ECM_DESIGNERPLUGIN="true"
69 +ECM_TEST="forceoptional"
70 +PVCUT=$(ver_cut 1-2)
71 +QTMIN=5.15.1
72 +VIRTUALX_REQUIRED="test"
73 +inherit ecm kde.org xdg-utils
74 +
75 +DESCRIPTION="Framework providing transparent file and data management"
76 +
77 +LICENSE="LGPL-2+"
78 +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
79 +IUSE="acl +handbook kerberos +kwallet X"
80 +
81 +RDEPEND="
82 + dev-libs/libxml2
83 + dev-libs/libxslt
84 + >=dev-qt/qtdbus-${QTMIN}:5
85 + >=dev-qt/qtdeclarative-${QTMIN}:5
86 + >=dev-qt/qtgui-${QTMIN}:5
87 + >=dev-qt/qtnetwork-${QTMIN}:5[ssl]
88 + >=dev-qt/qtwidgets-${QTMIN}:5
89 + >=dev-qt/qtxml-${QTMIN}:5
90 + =kde-frameworks/kauth-${PVCUT}*:5
91 + =kde-frameworks/karchive-${PVCUT}*:5
92 + =kde-frameworks/kbookmarks-${PVCUT}*:5
93 + =kde-frameworks/kcodecs-${PVCUT}*:5
94 + =kde-frameworks/kcompletion-${PVCUT}*:5
95 + =kde-frameworks/kconfig-${PVCUT}*:5
96 + =kde-frameworks/kconfigwidgets-${PVCUT}*:5
97 + =kde-frameworks/kcoreaddons-${PVCUT}*:5
98 + =kde-frameworks/kcrash-${PVCUT}*:5
99 + =kde-frameworks/kdbusaddons-${PVCUT}*:5
100 + =kde-frameworks/ki18n-${PVCUT}*:5
101 + =kde-frameworks/kiconthemes-${PVCUT}*:5
102 + =kde-frameworks/kitemviews-${PVCUT}*:5
103 + =kde-frameworks/kjobwidgets-${PVCUT}*:5
104 + =kde-frameworks/knotifications-${PVCUT}*:5
105 + =kde-frameworks/kservice-${PVCUT}*:5
106 + =kde-frameworks/ktextwidgets-${PVCUT}*:5
107 + =kde-frameworks/kwidgetsaddons-${PVCUT}*:5
108 + =kde-frameworks/kwindowsystem-${PVCUT}*:5
109 + =kde-frameworks/kxmlgui-${PVCUT}*:5
110 + =kde-frameworks/solid-${PVCUT}*:5
111 + acl? (
112 + sys-apps/attr
113 + virtual/acl
114 + )
115 + handbook? ( =kde-frameworks/kdoctools-${PVCUT}*:5 )
116 + kerberos? ( virtual/krb5 )
117 + kwallet? ( =kde-frameworks/kwallet-${PVCUT}*:5 )
118 + X? ( >=dev-qt/qtx11extras-${QTMIN}:5 )
119 +"
120 +DEPEND="${RDEPEND}
121 + >=dev-qt/qtconcurrent-${QTMIN}:5
122 + test? ( sys-libs/zlib )
123 + X? (
124 + x11-base/xorg-proto
125 + x11-libs/libX11
126 + x11-libs/libXrender
127 + )
128 +"
129 +PDEPEND="
130 + >=kde-frameworks/kded-${PVCUT}:5
131 +"
132 +
133 +# tests hang
134 +RESTRICT+=" test"
135 +
136 +PATCHES=( "${FILESDIR}/${P}-crashfix.patch" )
137 +
138 +src_configure() {
139 + local mycmakeargs=(
140 + $(cmake_use_find_package acl ACL)
141 + $(cmake_use_find_package handbook KF5DocTools)
142 + $(cmake_use_find_package kerberos GSSAPI)
143 + $(cmake_use_find_package kwallet KF5Wallet)
144 + $(cmake_use_find_package X X11)
145 + )
146 +
147 + ecm_src_configure
148 +}
149 +
150 +pkg_postinst() {
151 + ecm_pkg_postinst
152 + xdg_desktop_database_update
153 +}
154 +
155 +pkg_postrm() {
156 + ecm_pkg_postrm
157 + xdg_desktop_database_update
158 +}