diff options
Diffstat (limited to 'kde-apps/ark')
| -rw-r--r-- | kde-apps/ark/Manifest | 3 | ||||
| -rw-r--r-- | kde-apps/ark/ark-24.05.2-r1.ebuild | 83 | ||||
| -rw-r--r-- | kde-apps/ark/files/ark-24.05.2-qt6.7-qtemporarydir.patch | 37 |
3 files changed, 0 insertions, 123 deletions
diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest index 393eaf954d2d..32f08f202123 100644 --- a/kde-apps/ark/Manifest +++ b/kde-apps/ark/Manifest @@ -1,8 +1,5 @@ -AUX ark-24.05.2-qt6.7-qtemporarydir.patch 1795 BLAKE2B 37fb3231d3f6332789f9665076ca382b0f1961375bfd0ff344654791fc1cb8266719bbe35ae5601a8f2f0dbd93def1c96e5ce76830f43b3a0309c727cab0e658 SHA512 9de0798b603ed7fdfb8f706cd1a252db2b964489c02c59a51096887c43cd854439d03c456f3e84704250669e4283366d46c31d5a8cf3a1c66edb9f0b39de026b -DIST ark-24.05.2.tar.xz 3002644 BLAKE2B 9cb3108e528ca1e883445d2160bee25390d2c729cb1057cd48d33b996621421d25ea620380783d3e3b9280e9104f2e16164c6840a43c7e4e08e3ca2df5bb4c7e SHA512 d550c14ee12dc3a20933ee05117839f05f5ff664d63b9570640a1d635ec69cfdccab8f1f25b8a8ee34acd75916f4d8ab60b3c622098432fc276128288e26f534 DIST ark-24.08.1.tar.xz 3003728 BLAKE2B 3da6add6116c9e43bd007ca7b7a558c09811d5b0b5cd182903aab81628f6b851d3176d9776ac59644f9f84b3eacb34ef5010504b3634a85c48e306016623491e SHA512 0eacd3eb90355d5df95e519aa3ce2323b5378a12e8b88667dd236bd4e3da1737f0f9ff38ddd08070356804c312841e350ad8b84edc1b6fc00250e7304745b49e DIST ark-24.08.2.tar.xz 3008268 BLAKE2B 262da90a538f6338f32c44fdea30fb9738b806495ea9c5966623b5eb7be674e4e45f8039a58071cfa0407078374f433d7cc94a814057171f89307ac1b1d716c4 SHA512 4ee9cfe1d5ec49d5af5605ed7d00f7bdfdaa67f5ae36a6304afaa26ae3d45bade0128248c9d8d9c67e563e421de482315a2f76c0f9752fd2e2a46e6ef6c33c96 -EBUILD ark-24.05.2-r1.ebuild 2319 BLAKE2B 003f58628327c93c5a91a029268a8f667f8ad04736ea4f046cf31c3c1647c94edaa8bac16f594338783bb3747027f49d04785be3ace0723f18580ddc2d7e5246 SHA512 d7f4cadc90b434b1f3d769e98ff30b4723d796371763a52a3f13204f7456654c791f73098d096be031a5e2ef5d341ea35115e877f691a2df16adaeb008a77e25 EBUILD ark-24.08.1.ebuild 2221 BLAKE2B 355ccd06fca9c855d6d3faacfba05d433c06996166fbd3b3a08ebd8ed0f86ce603ca946eac3c617002febe240c95d59bf8ccacd17eff167f8553c4a8c35cf0e9 SHA512 a5e75a39202fea0788c2ca970a0d9633acf9e5868668dc8ab03a13d11844b162b5d0dbc3426dcd3a312b4d77da49eba5ee51be7ffc6a4d2fce0c70638e5732da EBUILD ark-24.08.2.ebuild 2223 BLAKE2B 00b23cb897ac932bd28fc2751508082c12dc45fbad03a1c63a6c21feec5596d3e75886b9bfd314b84b106bf0a3770c2445db295761905b452a608bb05459263f SHA512 72708abb5cdfd81fe70291496b94674b7dc767d961e52f6406e66bddd7c54c31fffe957515e2db9e57701d037d99a7c92ea8c62f315f9227a9eda972b8b8b38f MISC metadata.xml 468 BLAKE2B f4b2d609976bfc8a7bb4004286273c2384c7a5f9c45d6de44936d9f21dd4428d968c54cfb4d8cfe81e56bb935ed36c481b4c79a0e0a0b946b7e8ce78f794a123 SHA512 415c92c65d6d56b801c71db9153684635c8eeb0d571f1782127d8e7ab06a2b360cc016bc8ac110b7b9fcb53c587a177a5a7f69198b65fd152767a107aac1cd89 diff --git a/kde-apps/ark/ark-24.05.2-r1.ebuild b/kde-apps/ark/ark-24.05.2-r1.ebuild deleted file mode 100644 index b5c199cc67d3..000000000000 --- a/kde-apps/ark/ark-24.05.2-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="forceoptional" -ECM_TEST="true" -KFMIN=6.3.0 -QTMIN=6.6.2 -inherit ecm gear.kde.org optfeature - -DESCRIPTION="File archiver by KDE" -HOMEPAGE="https://apps.kde.org/ark/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6" -KEYWORDS="amd64 arm64 ~ppc64 ~riscv ~x86" -IUSE="zip" - -RDEPEND=" - >=app-arch/libarchive-3.5.3:=[bzip2,lzma] - >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,widgets] - >=kde-frameworks/kcompletion-${KFMIN}:6 - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/kdbusaddons-${KFMIN}:6 - >=kde-frameworks/kfilemetadata-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/kjobwidgets-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/kpty-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 - >=kde-frameworks/kwindowsystem-${KFMIN}:6 - >=kde-frameworks/kxmlgui-${KFMIN}:6 - sys-libs/zlib - zip? ( >=dev-libs/libzip-1.6.0:= ) -" -DEPEND="${RDEPEND} - >=kde-frameworks/kiconthemes-${KFMIN}:6 - >=dev-qt/qtbase-${QTMIN}:6[concurrent] - test? ( >=dev-libs/libzip-1.6.0:= ) -" -# app-arch/rar is binary only -BDEPEND=" - sys-devel/gettext - elibc_glibc? ( test? ( amd64? ( app-arch/rar ) x86? ( app-arch/rar ) ) ) -" - -PATCHES=( "${FILESDIR}"/${P}-qt6.7-qtemporarydir.patch ) - -CMAKE_SKIP_TESTS=( - # bug 822177: may segfault or hang indefinitely - kerfuffle-addtoarchivetest - # bug 827840: continuously broken with translations installed - plugins-clirartest - # bug 932499: failing upstream and disabled in 24.05.2 - kerfuffle-extracttest - # bug 927184: requires DBus - app-batchextracttest -) - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package zip LibZip) - ) - - ecm_src_configure -} - -pkg_postinst() { - if [[ -z "${REPLACING_VERSIONS}" ]]; then - 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}" - fi - ecm_pkg_postinst -} diff --git a/kde-apps/ark/files/ark-24.05.2-qt6.7-qtemporarydir.patch b/kde-apps/ark/files/ark-24.05.2-qt6.7-qtemporarydir.patch deleted file mode 100644 index 299fdce71290..000000000000 --- a/kde-apps/ark/files/ark-24.05.2-qt6.7-qtemporarydir.patch +++ /dev/null @@ -1,37 +0,0 @@ -https://mail.kde.org/pipermail/distributions/2024-July/001513.html -https://invent.kde.org/utilities/ark/-/commit/85c5e26f581cf011638a53e62b92e1da8fd55fcd - -[sam: Rebase for fuzz in the logline.] - -From 85c5e26f581cf011638a53e62b92e1da8fd55fcd Mon Sep 17 00:00:00 2001 -From: Elvis Angelaccio <elvis.angelaccio@kde.org> -Date: Sat, 22 Jun 2024 17:54:07 +0200 -Subject: [PATCH] cliinterface: adapt to behavior change in QTemporaryDir - -Qt 6.7 changed the behavior of QTemporaryDir (see commit 935562a77b in -qtbase.git) and now QTemporaryDir::path() returns a relative path rather -than an absolute one. - -We were relying on the old behavior which ensured that the extract temp -dir would always auto-delete itself, regardless of the ark CWD. - -This is no longer working, because now when the temp dir gets deleted, -its destructor tries to delete a relative path, but meanwhile ark has -already changed the CWD and so that path does not exist. - -The fix is to create the QTemporaryDir with an absolute path (but still -as hidden folder in the CWD), so we get back the old behavior (the -returned QTemporaryDir::path() will again be absolute). - -BUG: 487229 ---- a/kerfuffle/cliinterface.cpp -+++ b/kerfuffle/cliinterface.cpp -@@ -96,7 +96,7 @@ bool CliInterface::extractFiles(const QList<Archive::Entry *> &files, const QStr - - if (useTmpExtractDir) { - // Create an hidden temp folder in the current directory. -- m_extractTempDir.reset(new QTemporaryDir(QStringLiteral(".%1-").arg(QCoreApplication::applicationName()))); -+ m_extractTempDir.reset(new QTemporaryDir(QStringLiteral("%1/.%2-").arg(QDir::currentPath(), QCoreApplication::applicationName()))); - - qCDebug(ARK) << "Using temporary extraction dir:" << m_extractTempDir->path(); - if (!m_extractTempDir->isValid()) { |