gentoo auto-resync : 14:07:2024 - 12:27:13

3 files changed, 43 insertions, 1 deletions

diff --git a/kde-apps/ark/Manifest b/kde-apps/ark/Manifest
index ba813b6fbf6a..75cd0af07f64 100644
--- a/kde-apps/ark/Manifest
+++ b/kde-apps/ark/Manifest
@@ -1,5 +1,6 @@
+AUX ark-24.05.2-qt6.7-qtemporarydir.patch 1795 BLAKE2B 37fb3231d3f6332789f9665076ca382b0f1961375bfd0ff344654791fc1cb8266719bbe35ae5601a8f2f0dbd93def1c96e5ce76830f43b3a0309c727cab0e658 SHA512 9de0798b603ed7fdfb8f706cd1a252db2b964489c02c59a51096887c43cd854439d03c456f3e84704250669e4283366d46c31d5a8cf3a1c66edb9f0b39de026b
 DIST ark-23.08.5.tar.xz 3018696 BLAKE2B 482a17aa9bf72abbaa75510451ba0dd59812d2cd2aca97efda0f4f1c78f98060d9f654efd0387aeae35d5220304f00139520a6836451056b84064cc8d8b12d16 SHA512 8fab4281f5cfe34938f7a958e2889ad4dabff6613b1e3a8fed1efb2039dbf35a71d99494869037fd821515ecfba6e44304bb0907c27afd646fe7496783735336
 DIST ark-24.05.2.tar.xz 3002644 BLAKE2B 9cb3108e528ca1e883445d2160bee25390d2c729cb1057cd48d33b996621421d25ea620380783d3e3b9280e9104f2e16164c6840a43c7e4e08e3ca2df5bb4c7e SHA512 d550c14ee12dc3a20933ee05117839f05f5ff664d63b9570640a1d635ec69cfdccab8f1f25b8a8ee34acd75916f4d8ab60b3c622098432fc276128288e26f534
 EBUILD ark-23.08.5.ebuild 2225 BLAKE2B 2ef8b0fa658e0d2f602755bbf3b4d682297316a098cd46b50b75b2da13bbe49c792d9e2d550823f6d88436c80109acadc59c7739bf1e7bfce2f9388425f6b7c5 SHA512 1a1aabc77939a73687b5bbfe80702997b5a400ee7639bfef47e198d3d6596e1aeb8e8e48af22fc76c17a65fc8f67bb3fe7d85f4e2e8857dcd16bc9f3ea0118ff
-EBUILD ark-24.05.2.ebuild 2313 BLAKE2B ff595f8de3811cacb7c813f0f02ab72e3fbdfe824e31906f93400fa1328a9448f7008b3333e1945cd64b7644dc6215c921c14ce914a93d593f70598d80633507 SHA512 0f092307bde882d089c54106a940732badbab43c606aa5632a5228a36c603bd3f25b906fdd628834464b744590c8edfcdd73da8301d9dc6677c7104ed6c59f65
+EBUILD ark-24.05.2-r1.ebuild 2372 BLAKE2B a84b421fca60ed50b7eb93b5bdd9c21af0efd59de7f90dcbc74ed01172f7a79a5a67c5c0f6651412e73c070c8bbdb9fff5171ec274527b4d8848b3c4920659c3 SHA512 0ad38f26c3eca9d75bad5128b4531d67af093b7ec50f77dcb58c77aa619909cd8e4d720eae2695d7e51932ca649bad270e7c676361126bba732a1292bcebaa86
 MISC metadata.xml 468 BLAKE2B f4b2d609976bfc8a7bb4004286273c2384c7a5f9c45d6de44936d9f21dd4428d968c54cfb4d8cfe81e56bb935ed36c481b4c79a0e0a0b946b7e8ce78f794a123 SHA512 415c92c65d6d56b801c71db9153684635c8eeb0d571f1782127d8e7ab06a2b360cc016bc8ac110b7b9fcb53c587a177a5a7f69198b65fd152767a107aac1cd89
diff --git a/kde-apps/ark/ark-24.05.2.ebuild b/kde-apps/ark/ark-24.05.2-r1.ebuild
index 789686d922ec..fbbd5a228e83 100644
--- a/kde-apps/ark/ark-24.05.2.ebuild
+++ b/kde-apps/ark/ark-24.05.2-r1.ebuild
@@ -50,6 +50,10 @@ BDEPEND="
 	elibc_glibc? ( test? ( amd64? ( app-arch/rar ) x86? ( app-arch/rar ) ) )
 "
 
+PATCHES=(
+	"${FILESDIR}"/${P}-qt6.7-qtemporarydir.patch
+)
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake_use_find_package zip LibZip)
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
new file mode 100644
index 000000000000..299fdce71290
--- /dev/null
+++ b/kde-apps/ark/files/ark-24.05.2-qt6.7-qtemporarydir.patch
@@ -0,0 +1,37 @@
+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()) {