1 |
commit: 8fa2be52bcad3ca8e38b5ce6f4ac49074839612f |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Feb 4 13:37:26 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Feb 4 14:05:58 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa2be52 |
7 |
|
8 |
kde-apps/ark: drop 20.12.1* |
9 |
|
10 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
11 |
|
12 |
kde-apps/ark/Manifest | 1 - |
13 |
kde-apps/ark/ark-20.12.1.ebuild | 80 ---------------------- |
14 |
kde-apps/ark/files/ark-20.12.1-runtime-crash.patch | 60 ---------------- |
15 |
3 files changed, 141 deletions(-) |
16 |
|
17 |
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest |
18 |
index 1389bd5211f..c283cbad6c9 100644 |
19 |
--- a/kde-apps/ark/Manifest |
20 |
+++ b/kde-apps/ark/Manifest |
21 |
@@ -1,3 +1,2 @@ |
22 |
DIST ark-20.08.3.tar.xz 2711708 BLAKE2B c486320f113ab3d12b67aec7589e7973a022415da5dbe01754a9e454c74bb59d2b6556c6934aafd7b5c0ee685e2eca7feee276ad3ebb8a0c6f57aea5bc666a0f SHA512 41ab1498b77f9d152f900eba9e784e8ed28127c849796e42c18db5beb963b0c8f2a1ef1c408d37db02fb21577e5d8e08d8561b72b14042e079a5f1baffa01a01 |
23 |
-DIST ark-20.12.1.tar.xz 2716648 BLAKE2B c24c36c9d91d7a06073b8d5d6cdee509551f81f68b92cfcf83ed3330a8615de92b8494f7f7b5968ca85d51c947da54d08e7181cd5c56ab306b9826ebb695cb58 SHA512 1b3c145c03ba29a742f36bd8808addc4484a519c7f2d514fbed43866d07e7b119e3b7c2df68ee14371f83e3d441bb575e5524495f1b8976062d9c0032bdb566a |
24 |
DIST ark-20.12.2.tar.xz 2717316 BLAKE2B d7ac5b3a69f8571ac66b51d726ed9d4d89aaa240ac32d4d9202ae25209951414c668d6d8902dd171728ce58e82a1cb3bfa86f4ef24ace566f36c77760daa52e9 SHA512 5992525f6459e007deec1047bb3e7f35cc47c3cb3e831e1af3a93044ce96fbf96f2e2466e411f12ac836243f463e15c0c67173251adee192e85a43b3afd461ba |
25 |
|
26 |
diff --git a/kde-apps/ark/ark-20.12.1.ebuild b/kde-apps/ark/ark-20.12.1.ebuild |
27 |
deleted file mode 100644 |
28 |
index 0ee40c563d4..00000000000 |
29 |
--- a/kde-apps/ark/ark-20.12.1.ebuild |
30 |
+++ /dev/null |
31 |
@@ -1,80 +0,0 @@ |
32 |
-# Copyright 1999-2021 Gentoo Authors |
33 |
-# Distributed under the terms of the GNU General Public License v2 |
34 |
- |
35 |
-EAPI=7 |
36 |
- |
37 |
-ECM_HANDBOOK="forceoptional" |
38 |
-ECM_TEST="optional" |
39 |
-KFMIN=5.75.0 |
40 |
-QTMIN=5.15.1 |
41 |
-VIRTUALX_REQUIRED="test" |
42 |
-inherit ecm kde.org optfeature |
43 |
- |
44 |
-DESCRIPTION="File archiver by KDE" |
45 |
-HOMEPAGE="https://apps.kde.org/en/ark https://utils.kde.org/projects/ark/" |
46 |
- |
47 |
-LICENSE="GPL-2" # TODO: CHECK |
48 |
-SLOT="5" |
49 |
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
50 |
-IUSE="zip" |
51 |
- |
52 |
-BDEPEND=" |
53 |
- sys-devel/gettext |
54 |
-" |
55 |
-RDEPEND=" |
56 |
- app-arch/libarchive:=[bzip2,lzma,zlib] |
57 |
- >=dev-qt/qtdbus-${QTMIN}:5 |
58 |
- >=dev-qt/qtgui-${QTMIN}:5 |
59 |
- >=dev-qt/qtwidgets-${QTMIN}:5 |
60 |
- >=kde-frameworks/karchive-${KFMIN}:5 |
61 |
- >=kde-frameworks/kcompletion-${KFMIN}:5 |
62 |
- >=kde-frameworks/kconfig-${KFMIN}:5 |
63 |
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
64 |
- >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
65 |
- >=kde-frameworks/kcrash-${KFMIN}:5 |
66 |
- >=kde-frameworks/kdbusaddons-${KFMIN}:5 |
67 |
- >=kde-frameworks/ki18n-${KFMIN}:5 |
68 |
- >=kde-frameworks/kio-${KFMIN}:5 |
69 |
- >=kde-frameworks/kitemmodels-${KFMIN}:5 |
70 |
- >=kde-frameworks/kjobwidgets-${KFMIN}:5 |
71 |
- >=kde-frameworks/kparts-${KFMIN}:5 |
72 |
- >=kde-frameworks/kpty-${KFMIN}:5 |
73 |
- >=kde-frameworks/kservice-${KFMIN}:5 |
74 |
- >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
75 |
- >=kde-frameworks/kxmlgui-${KFMIN}:5 |
76 |
- sys-libs/zlib |
77 |
- zip? ( >=dev-libs/libzip-1.2.0:= ) |
78 |
-" |
79 |
-DEPEND="${RDEPEND} |
80 |
- >=dev-qt/qtconcurrent-${QTMIN}:5 |
81 |
-" |
82 |
- |
83 |
-PATCHES=( "${FILESDIR}/${P}-runtime-crash.patch" ) |
84 |
- |
85 |
-src_configure() { |
86 |
- local mycmakeargs=( |
87 |
- $(cmake_use_find_package zip LibZip) |
88 |
- ) |
89 |
- |
90 |
- ecm_src_configure |
91 |
-} |
92 |
- |
93 |
-src_test() { |
94 |
- local myctestargs=( |
95 |
- -E "(plugins-clirartest)" |
96 |
- ) |
97 |
- |
98 |
- ecm_src_test |
99 |
-} |
100 |
- |
101 |
-pkg_postinst() { |
102 |
- if [[ -z "${REPLACING_VERSIONS}" ]]; then |
103 |
- elog "Optional dependencies:" |
104 |
- optfeature "rar archive creation/extraction" app-arch/rar |
105 |
- optfeature "rar archive extraction only" app-arch/unar app-arch/unrar |
106 |
- optfeature "7-Zip archive support" app-arch/p7zip |
107 |
- optfeature "lrz archive support" app-arch/lrzip |
108 |
- optfeature "markdown support in text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT} |
109 |
- fi |
110 |
- ecm_pkg_postinst |
111 |
-} |
112 |
|
113 |
diff --git a/kde-apps/ark/files/ark-20.12.1-runtime-crash.patch b/kde-apps/ark/files/ark-20.12.1-runtime-crash.patch |
114 |
deleted file mode 100644 |
115 |
index 9ee6c7b93b9..00000000000 |
116 |
--- a/kde-apps/ark/files/ark-20.12.1-runtime-crash.patch |
117 |
+++ /dev/null |
118 |
@@ -1,60 +0,0 @@ |
119 |
-From a41e69b30cc07dd758849f8685d322150459e4f1 Mon Sep 17 00:00:00 2001 |
120 |
-From: Elvis Angelaccio <elvis.angelaccio@×××.org> |
121 |
-Date: Tue, 5 Jan 2021 21:50:34 +0100 |
122 |
-Subject: [PATCH] Fix crash after closing the window while loading a TAR |
123 |
- archive |
124 |
- |
125 |
-A first problem was in LibarchivePlugin::list() not checking |
126 |
-isInterruptionRequested() after the while loop. It was wrongly calling |
127 |
-emitCorruptArchive() instead of aborting as requested. |
128 |
- |
129 |
-But according to the stacktrace, the actual crash seemed to be caused by |
130 |
-the for() loop over qAsConst(m_jobs): |
131 |
- |
132 |
- #0 0x00007ffff5f6a023 in QHashData::nextNode(QHashData::Node*) () from /usr/lib/libQt5Core.so.5 |
133 |
- #1 0x00007fffe1dcb2ec in QHash<KJob*, QHashDummyValue>::const_iterator::operator++ (this=0x7fffffffc4d0) at /usr/include/qt/QtCore/qhash.h:426 |
134 |
- #2 0x00007fffe1dcadac in QSet<KJob*>::const_iterator::operator++ (this=0x7fffffffc4d0) at /usr/include/qt/QtCore/qset.h:174 |
135 |
- #3 0x00007fffe1dca17e in JobTracker::~JobTracker (this=0x555555c319c0) at ../part/jobtracker.cpp:41 |
136 |
- |
137 |
-Porting to QSetIterator fixes the crash. |
138 |
- |
139 |
-BUG: 410092 |
140 |
-FIXED-IN: 20.12.2 |
141 |
---- |
142 |
- part/jobtracker.cpp | 4 +++- |
143 |
- plugins/libarchive/libarchiveplugin.cpp | 4 ++++ |
144 |
- 2 files changed, 7 insertions(+), 1 deletion(-) |
145 |
- |
146 |
-diff --git a/part/jobtracker.cpp b/part/jobtracker.cpp |
147 |
-index e11e402d..a7a57fef 100644 |
148 |
---- a/part/jobtracker.cpp |
149 |
-+++ b/part/jobtracker.cpp |
150 |
-@@ -38,7 +38,9 @@ JobTracker::JobTracker(QWidget *parent) |
151 |
- |
152 |
- JobTracker::~JobTracker() |
153 |
- { |
154 |
-- for (KJob *job : qAsConst(m_jobs)) { |
155 |
-+ QSetIterator<KJob *> it(m_jobs); |
156 |
-+ while (it.hasNext()) { |
157 |
-+ auto job = it.next(); |
158 |
- job->kill(); |
159 |
- } |
160 |
- } |
161 |
-diff --git a/plugins/libarchive/libarchiveplugin.cpp b/plugins/libarchive/libarchiveplugin.cpp |
162 |
-index d2c0d7e1..8a6af526 100644 |
163 |
---- a/plugins/libarchive/libarchiveplugin.cpp |
164 |
-+++ b/plugins/libarchive/libarchiveplugin.cpp |
165 |
-@@ -113,6 +113,10 @@ bool LibarchivePlugin::list() |
166 |
- } |
167 |
- } |
168 |
- |
169 |
-+ if (QThread::currentThread()->isInterruptionRequested()) { |
170 |
-+ return false; |
171 |
-+ } |
172 |
-+ |
173 |
- if (result != ARCHIVE_EOF) { |
174 |
- qCCritical(ARK) << "Error while reading archive:" |
175 |
- << result |
176 |
--- |
177 |
-GitLab |
178 |
- |