From 24fd814c326e282c4321965c31f341dad77e270d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 8 Jan 2021 11:28:34 +0000 Subject: gentoo resync : 08.01.2021 --- kde-apps/ark/Manifest | 5 +- kde-apps/ark/ark-20.12.0.ebuild | 78 --------------------- kde-apps/ark/ark-20.12.1.ebuild | 80 ++++++++++++++++++++++ kde-apps/ark/files/ark-20.12.1-runtime-crash.patch | 60 ++++++++++++++++ 4 files changed, 143 insertions(+), 80 deletions(-) delete mode 100644 kde-apps/ark/ark-20.12.0.ebuild create mode 100644 kde-apps/ark/ark-20.12.1.ebuild create mode 100644 kde-apps/ark/files/ark-20.12.1-runtime-crash.patch (limited to 'kde-apps/ark') diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest index 1674373073fa..2b470051f2ec 100644 --- a/kde-apps/ark/Manifest +++ b/kde-apps/ark/Manifest @@ -1,5 +1,6 @@ +AUX ark-20.12.1-runtime-crash.patch 2176 BLAKE2B 7ac2ae3d8406ce56516a7666373efcd488d2e109a390d06d364b81a291594f917c27a9fe5723eb0fcb9e11f11d892bf78598e5a4edc8a8241d0d7bc2b21867fa SHA512 579e027b92e1b27f9aea1cdf9688b0cf46ebae871c998877f57c4f2d829582c2844f31410699980bd6b3079d17614e2330ca6873c557487afbaa2ae697a89035 DIST ark-20.08.3.tar.xz 2711708 BLAKE2B c486320f113ab3d12b67aec7589e7973a022415da5dbe01754a9e454c74bb59d2b6556c6934aafd7b5c0ee685e2eca7feee276ad3ebb8a0c6f57aea5bc666a0f SHA512 41ab1498b77f9d152f900eba9e784e8ed28127c849796e42c18db5beb963b0c8f2a1ef1c408d37db02fb21577e5d8e08d8561b72b14042e079a5f1baffa01a01 -DIST ark-20.12.0.tar.xz 2716084 BLAKE2B 1a90dc48c03581168e428e0af6c2ec4ecb6f3e5425b50bf22b790755dafb4fb373eeaafd486fe8ec8f3e37ffaf5e4c5c42fec5db0ff89d8fa0c5215fe87327ad SHA512 1f2e1bb47560e9e5bb81c90b83c5e634cb60f759f81db2e54dfe7caa66bb170c6591538516398fcb90e32c0c86beebee49e37ad8d7f19ed0a343c7d1305a7c33 +DIST ark-20.12.1.tar.xz 2716648 BLAKE2B c24c36c9d91d7a06073b8d5d6cdee509551f81f68b92cfcf83ed3330a8615de92b8494f7f7b5968ca85d51c947da54d08e7181cd5c56ab306b9826ebb695cb58 SHA512 1b3c145c03ba29a742f36bd8808addc4484a519c7f2d514fbed43866d07e7b119e3b7c2df68ee14371f83e3d441bb575e5524495f1b8976062d9c0032bdb566a EBUILD ark-20.08.3.ebuild 1984 BLAKE2B 39c49bf07dd81ef82c1ec4696c1baad53fc3ce4a27785b17414dae84e60064a5731dbed505d4af8e3231d715ccbdf8c2386d8170114a25236ccb888ff300a031 SHA512 7e82c9ae8b6077833143ebfd256ce04786d84f04da1a1dff3626ae1d9b3a212adc031338ad6fd92018719f4219ed2c9dc30950d18034ea1b70337afe9185dd4e -EBUILD ark-20.12.0.ebuild 1987 BLAKE2B 5136d50b21ec643ac9e8553b658d289606e9d23774d7406c7aaa97891f89bc353bd4f1d0c85a520b3ab61fe425ac123ef17fda6653de43ff02e4815b51fa852c SHA512 bb16ea10c7215b1683e29ee2fb8d300ebb64eb07689e1a2359bf71bd0280f36f5e024ac97f1c2c47ababb1b6712d1aab2a307353ed2dd9d4481405f65b97bad2 +EBUILD ark-20.12.1.ebuild 2039 BLAKE2B 6a66d4670028ceef5467b6abb3766e881e86c7ab049104505e10fd4ffb5ce51714699ffa2e4cde77485d1a191ddb9d92e2a3a0010bf25e157da224416dc88ee4 SHA512 d92e6458b288210f31340448bd43d6841814637c59bfc9c9924ab6707317ca3ca3f70a1e1559bf10689e236e45a807023f1fdce87f21fffdd51f5d193f042d97 MISC metadata.xml 348 BLAKE2B 89cd42a24774f85082d025bc18402e0d4a36e07ab62155b67474a14c7294de3875d078167521f6cc4496f97f311de9264ff8c41e78477101a80d0ae2a034dcaf SHA512 447d60adfaec4e52c25d7a61a281b8b044c9a786a0600b8a8260a150f6842047f45b981aabb75e56255d05a918370113f6d2552fec1b88f661141453e003c472 diff --git a/kde-apps/ark/ark-20.12.0.ebuild b/kde-apps/ark/ark-20.12.0.ebuild deleted file mode 100644 index 6ef09a3c95ed..000000000000 --- a/kde-apps/ark/ark-20.12.0.ebuild +++ /dev/null @@ -1,78 +0,0 @@ -# Copyright 1999-2020 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 -" - -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/ark-20.12.1.ebuild b/kde-apps/ark/ark-20.12.1.ebuild new file mode 100644 index 000000000000..0ee40c563d43 --- /dev/null +++ b/kde-apps/ark/ark-20.12.1.ebuild @@ -0,0 +1,80 @@ +# 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 new file mode 100644 index 000000000000..9ee6c7b93b9f --- /dev/null +++ b/kde-apps/ark/files/ark-20.12.1-runtime-crash.patch @@ -0,0 +1,60 @@ +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 + -- cgit v1.2.3