From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id BFEB31382C5 for ; Thu, 4 Feb 2021 14:15:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 40C8AE093B; Thu, 4 Feb 2021 14:15:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EBA4CE0940 for ; Thu, 4 Feb 2021 14:15:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC97A34261E for ; Thu, 4 Feb 2021 14:07:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1D49D4C0 for ; Thu, 4 Feb 2021 14:07:10 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1612447558.8fa2be52bcad3ca8e38b5ce6f4ac49074839612f.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/ark/, kde-apps/ark/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/ark/Manifest kde-apps/ark/ark-20.12.1.ebuild kde-apps/ark/files/ark-20.12.1-runtime-crash.patch X-VCS-Directories: kde-apps/ark/files/ kde-apps/ark/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 8fa2be52bcad3ca8e38b5ce6f4ac49074839612f X-VCS-Branch: master Date: Thu, 4 Feb 2021 14:07:10 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d864099c-f34f-4e30-9c32-7ea93b2e8886 X-Archives-Hash: 1533536b1842ec9f408f761b6d6f7074 commit: 8fa2be52bcad3ca8e38b5ce6f4ac49074839612f Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Feb 4 13:37:26 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Feb 4 14:05:58 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8fa2be52 kde-apps/ark: drop 20.12.1* Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/ark/Manifest | 1 - kde-apps/ark/ark-20.12.1.ebuild | 80 ---------------------- kde-apps/ark/files/ark-20.12.1-runtime-crash.patch | 60 ---------------- 3 files changed, 141 deletions(-) diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest index 1389bd5211f..c283cbad6c9 100644 --- a/kde-apps/ark/Manifest +++ b/kde-apps/ark/Manifest @@ -1,3 +1,2 @@ DIST ark-20.08.3.tar.xz 2711708 BLAKE2B c486320f113ab3d12b67aec7589e7973a022415da5dbe01754a9e454c74bb59d2b6556c6934aafd7b5c0ee685e2eca7feee276ad3ebb8a0c6f57aea5bc666a0f SHA512 41ab1498b77f9d152f900eba9e784e8ed28127c849796e42c18db5beb963b0c8f2a1ef1c408d37db02fb21577e5d8e08d8561b72b14042e079a5f1baffa01a01 -DIST ark-20.12.1.tar.xz 2716648 BLAKE2B c24c36c9d91d7a06073b8d5d6cdee509551f81f68b92cfcf83ed3330a8615de92b8494f7f7b5968ca85d51c947da54d08e7181cd5c56ab306b9826ebb695cb58 SHA512 1b3c145c03ba29a742f36bd8808addc4484a519c7f2d514fbed43866d07e7b119e3b7c2df68ee14371f83e3d441bb575e5524495f1b8976062d9c0032bdb566a DIST ark-20.12.2.tar.xz 2717316 BLAKE2B d7ac5b3a69f8571ac66b51d726ed9d4d89aaa240ac32d4d9202ae25209951414c668d6d8902dd171728ce58e82a1cb3bfa86f4ef24ace566f36c77760daa52e9 SHA512 5992525f6459e007deec1047bb3e7f35cc47c3cb3e831e1af3a93044ce96fbf96f2e2466e411f12ac836243f463e15c0c67173251adee192e85a43b3afd461ba diff --git a/kde-apps/ark/ark-20.12.1.ebuild b/kde-apps/ark/ark-20.12.1.ebuild deleted file mode 100644 index 0ee40c563d4..00000000000 --- a/kde-apps/ark/ark-20.12.1.ebuild +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="optional" -KFMIN=5.75.0 -QTMIN=5.15.1 -VIRTUALX_REQUIRED="test" -inherit ecm kde.org optfeature - -DESCRIPTION="File archiver by KDE" -HOMEPAGE="https://apps.kde.org/en/ark https://utils.kde.org/projects/ark/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="5" -KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -IUSE="zip" - -BDEPEND=" - sys-devel/gettext -" -RDEPEND=" - app-arch/libarchive:=[bzip2,lzma,zlib] - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kcrash-${KFMIN}:5 - >=kde-frameworks/kdbusaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kitemmodels-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/kparts-${KFMIN}:5 - >=kde-frameworks/kpty-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - sys-libs/zlib - zip? ( >=dev-libs/libzip-1.2.0:= ) -" -DEPEND="${RDEPEND} - >=dev-qt/qtconcurrent-${QTMIN}:5 -" - -PATCHES=( "${FILESDIR}/${P}-runtime-crash.patch" ) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package zip LibZip) - ) - - ecm_src_configure -} - -src_test() { - local myctestargs=( - -E "(plugins-clirartest)" - ) - - ecm_src_test -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - elog "Optional dependencies:" - optfeature "rar archive creation/extraction" app-arch/rar - optfeature "rar archive extraction only" app-arch/unar app-arch/unrar - optfeature "7-Zip archive support" app-arch/p7zip - optfeature "lrz archive support" app-arch/lrzip - optfeature "markdown support in text previews" kde-misc/markdownpart:${SLOT} kde-misc/kmarkdownwebview:${SLOT} - fi - ecm_pkg_postinst -} 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 deleted file mode 100644 index 9ee6c7b93b9..00000000000 --- a/kde-apps/ark/files/ark-20.12.1-runtime-crash.patch +++ /dev/null @@ -1,60 +0,0 @@ -From a41e69b30cc07dd758849f8685d322150459e4f1 Mon Sep 17 00:00:00 2001 -From: Elvis Angelaccio -Date: Tue, 5 Jan 2021 21:50:34 +0100 -Subject: [PATCH] Fix crash after closing the window while loading a TAR - archive - -A first problem was in LibarchivePlugin::list() not checking -isInterruptionRequested() after the while loop. It was wrongly calling -emitCorruptArchive() instead of aborting as requested. - -But according to the stacktrace, the actual crash seemed to be caused by -the for() loop over qAsConst(m_jobs): - - #0 0x00007ffff5f6a023 in QHashData::nextNode(QHashData::Node*) () from /usr/lib/libQt5Core.so.5 - #1 0x00007fffe1dcb2ec in QHash::const_iterator::operator++ (this=0x7fffffffc4d0) at /usr/include/qt/QtCore/qhash.h:426 - #2 0x00007fffe1dcadac in QSet::const_iterator::operator++ (this=0x7fffffffc4d0) at /usr/include/qt/QtCore/qset.h:174 - #3 0x00007fffe1dca17e in JobTracker::~JobTracker (this=0x555555c319c0) at ../part/jobtracker.cpp:41 - -Porting to QSetIterator fixes the crash. - -BUG: 410092 -FIXED-IN: 20.12.2 ---- - part/jobtracker.cpp | 4 +++- - plugins/libarchive/libarchiveplugin.cpp | 4 ++++ - 2 files changed, 7 insertions(+), 1 deletion(-) - -diff --git a/part/jobtracker.cpp b/part/jobtracker.cpp -index e11e402d..a7a57fef 100644 ---- a/part/jobtracker.cpp -+++ b/part/jobtracker.cpp -@@ -38,7 +38,9 @@ JobTracker::JobTracker(QWidget *parent) - - JobTracker::~JobTracker() - { -- for (KJob *job : qAsConst(m_jobs)) { -+ QSetIterator it(m_jobs); -+ while (it.hasNext()) { -+ auto job = it.next(); - job->kill(); - } - } -diff --git a/plugins/libarchive/libarchiveplugin.cpp b/plugins/libarchive/libarchiveplugin.cpp -index d2c0d7e1..8a6af526 100644 ---- a/plugins/libarchive/libarchiveplugin.cpp -+++ b/plugins/libarchive/libarchiveplugin.cpp -@@ -113,6 +113,10 @@ bool LibarchivePlugin::list() - } - } - -+ if (QThread::currentThread()->isInterruptionRequested()) { -+ return false; -+ } -+ - if (result != ARCHIVE_EOF) { - qCCritical(ARK) << "Error while reading archive:" - << result --- -GitLab -