summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-06-06 18:36:18 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-06-10 17:29:41 +0200
commit8fde89eed0ae11fe40ad778f975445294ba1b6be (patch)
tree8b57aff220fd8b06976a5392f9fe8aeeb5d9777e /kde-misc/kio-fuse
parentkde-misc/latte-dock: Drop 0.9.11 (diff)
downloadgentoo-8fde89eed0ae11fe40ad778f975445294ba1b6be.tar.gz
gentoo-8fde89eed0ae11fe40ad778f975445294ba1b6be.tar.bz2
gentoo-8fde89eed0ae11fe40ad778f975445294ba1b6be.zip
kde-misc/kio-fuse: Drop 5.0.0-r1
Package-Manager: Portage-3.0.19, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-misc/kio-fuse')
-rw-r--r--kde-misc/kio-fuse/Manifest1
-rw-r--r--kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-1.patch32
-rw-r--r--kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-2.patch49
-rw-r--r--kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild45
4 files changed, 0 insertions, 127 deletions
diff --git a/kde-misc/kio-fuse/Manifest b/kde-misc/kio-fuse/Manifest
index 884a5bd49e34..7584bcac2bcc 100644
--- a/kde-misc/kio-fuse/Manifest
+++ b/kde-misc/kio-fuse/Manifest
@@ -1,2 +1 @@
-DIST kio-fuse-5.0.0.tar.xz 46672 BLAKE2B 4e3dbf9ad8c00140c6d3ca2c364bde1c4a8a9eacf875101cf5089460357e05421df73420f030cbef5c6aeab213eed18fa53490b335b0e00ee86cf284b3d02faf SHA512 3c75e1abc0c357be4291e9a93902e510f249e8a980ae39e997ba0f252058114b0a717667e32528afc055eccd96576acfd0942f9f45526c3be69627d399dbf575
DIST kio-fuse-5.0.1.tar.xz 47596 BLAKE2B 3ed4f2a17aac1743ad0c8bc7421738eb499ea95eb20088444c241763b53315b8cd8a592d0ed18c7a6180de6040774f6d53429f8d1fe515eb4769fb95e680b530 SHA512 6423c461c001bb27d4e17e6f9a69e4a28c2e7834b6702bd14e4b34db9fc3156cdbb5400ec2c3f15975e78e563abbf14412f8f1b1db05f6313a8520bab030e7bd
diff --git a/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-1.patch b/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-1.patch
deleted file mode 100644
index 7ef61ca22028..000000000000
--- a/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-1.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 1ee510baa80c834bbcf77a008e5668dbf3eccf4d Mon Sep 17 00:00:00 2001
-From: Alexander Saoutkin <a.saoutkin@gmail.com>
-Date: Sat, 2 Jan 2021 20:01:16 +0000
-Subject: [PATCH] Check return value of createNodeFromUDSEntry()
-
-createNodeFromUDSEntry() can return a nullptr, which it does when
-passed any URL from the baloosearch protocol.
-
-BUG: 431079
----
- kiofusevfs.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/kiofusevfs.cpp b/kiofusevfs.cpp
-index 6f275cb..fbf6e27 100644
---- a/kiofusevfs.cpp
-+++ b/kiofusevfs.cpp
-@@ -393,6 +393,11 @@ void KIOFuseVFS::findAndCreateOrigin(QUrl url, QStringList pathElements, std::fu
- if(!finalNode)
- {
- finalNode = createNodeFromUDSEntry(statJob->statResult(), currentNode->m_stat.st_ino, targetPathComponents.last());
-+ if(!finalNode)
-+ {
-+ qWarning(KIOFUSE_LOG) << "Unable to create a valid final node for" << url << "from its UDS Entry";
-+ return callback({}, EIO);
-+ }
- insertNode(finalNode);
- }
-
---
-GitLab
-
diff --git a/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-2.patch b/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-2.patch
deleted file mode 100644
index a16da6d75357..000000000000
--- a/kde-misc/kio-fuse/files/kio-fuse-5.0.0-fix-segfault-on-links-2.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From d69959e226b1b49a1fc2d1a566acd4fdde0f97c3 Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Thu, 7 Jan 2021 22:46:19 +0100
-Subject: [PATCH] UDS_URL is not meant for links, Use UDS_TARGET_URL instead
-
-The KIO documentation for UDS_URL says:
-`use UDS_TARGET_URL if you want "links" to unrelated urls.`
-So the use of UDS_URL here was probably wrong.
-Switching to UDS_TARGET_URL fixes mounting of some slaves such as baloosearch,
-which set UDS_URL to the URL of the entry itself for some reason.
-
-BUG: 431079
----
- kiofusevfs.cpp | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
-
-diff --git a/kiofusevfs.cpp b/kiofusevfs.cpp
-index fbf6e27..5c775b7 100644
---- a/kiofusevfs.cpp
-+++ b/kiofusevfs.cpp
-@@ -1736,12 +1736,12 @@ std::shared_ptr<KIOFuseNode> KIOFuseVFS::createNodeFromUDSEntry(const KIO::UDSEn
- attr.st_gid = gr->gr_gid;
- }
-
-- if(entry.contains(KIO::UDSEntry::UDS_LOCAL_PATH) || entry.contains(KIO::UDSEntry::UDS_URL))
-+ if(entry.contains(KIO::UDSEntry::UDS_LOCAL_PATH) || entry.contains(KIO::UDSEntry::UDS_TARGET_URL))
- {
- // Create as symlink if possible
- QString target = entry.stringValue(KIO::UDSEntry::UDS_LOCAL_PATH);
- if(target.isEmpty())
-- target = QUrl(entry.stringValue(KIO::UDSEntry::UDS_URL)).toLocalFile();
-+ target = QUrl(entry.stringValue(KIO::UDSEntry::UDS_TARGET_URL)).toLocalFile();
-
- if(!target.isEmpty())
- {
-@@ -1760,7 +1760,9 @@ std::shared_ptr<KIOFuseNode> KIOFuseVFS::createNodeFromUDSEntry(const KIO::UDSEn
- {
- attr.st_mode |= S_IFREG;
- std::shared_ptr<KIOFuseRemoteFileNode> ret = nullptr;
-- const QUrl nodeUrl = QUrl{entry.stringValue(KIO::UDSEntry::UDS_URL)};
-+ const QUrl nodeUrl = QUrl{entry.stringValue(KIO::UDSEntry::UDS_TARGET_URL)};
-+ if(nodeUrl.isEmpty())
-+ return nullptr;
- if(m_useFileJob && KProtocolManager::supportsOpening(nodeUrl) && KProtocolManager::supportsTruncating(nodeUrl))
- ret = std::make_shared<KIOFuseRemoteFileJobBasedFileNode>(parentIno, name, attr);
- else
---
-GitLab
-
diff --git a/kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild b/kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild
deleted file mode 100644
index 17131a6858b5..000000000000
--- a/kde-misc/kio-fuse/kio-fuse-5.0.0-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-KFMIN=5.74.0
-QTMIN=5.15.1
-inherit ecm kde.org linux-info
-
-DESCRIPTION="FUSE interface for KIO"
-HOMEPAGE="https://feverfew.home.blog/2019/12/24/kiofuse-beta-4-9-0-released/"
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
- KEYWORDS="amd64 arm64 ~ppc64 x86"
-fi
-
-LICENSE="GPL-3+"
-SLOT="5"
-IUSE=""
-
-RESTRICT+=" test" # depend on fuse kernel module
-
-DEPEND="
- >=dev-qt/qtdbus-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- sys-fs/fuse:3
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-fix-segfault-on-links-{1,2}.patch # KDE-Bug 431079
-)
-
-pkg_setup() {
- local CONFIG_CHECK="~FUSE_FS"
- linux-info_pkg_setup
-
- ecm_pkg_setup
-}