chore: Update kf5-kio

This commit is contained in:
Kyle Gospodnetich 2024-02-24 21:55:21 -08:00
parent 546a9cdf06
commit ae9b33622c
2 changed files with 5 additions and 35 deletions

View File

@ -1,30 +0,0 @@
From af3af80d30025711574d1ca450dc0aed9d44d7fd Mon Sep 17 00:00:00 2001
From: Alessandro Astone <ales.astone@gmail.com>
Date: Wed, 10 Jan 2024 22:18:58 +0100
Subject: [PATCH] KDirModel: Allow expanding network directories in file picker
again
Closes: https://invent.kde.org/frameworks/kio/-/issues/29
BUG: 479531
---
src/widgets/kdirmodel.cpp | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/widgets/kdirmodel.cpp b/src/widgets/kdirmodel.cpp
index c274256811..9dbd8e3e9e 100644
--- a/src/widgets/kdirmodel.cpp
+++ b/src/widgets/kdirmodel.cpp
@@ -1329,8 +1329,7 @@ bool KDirModel::canFetchMore(const QModelIndex &parent) const
KDirModelNode *node = static_cast<KDirModelNode *>(parent.internalPointer());
const KFileItem &item = node->item();
- return item.isDir() && !static_cast<KDirModelDirNode *>(node)->isOnNetwork() && !static_cast<KDirModelDirNode *>(node)->isPopulated()
- && static_cast<KDirModelDirNode *>(node)->m_childNodes.isEmpty();
+ return item.isDir() && !static_cast<KDirModelDirNode *>(node)->isPopulated() && static_cast<KDirModelDirNode *>(node)->m_childNodes.isEmpty();
}
void KDirModel::fetchMore(const QModelIndex &parent)
--
GitLab

View File

@ -3,7 +3,7 @@
%bcond kf6_compat %[0%{?fedora} >= 40 || 0%{?rhel} >= 10]
Name: kf5-%{framework}
%global majmin 5.113
%global majmin 5.115
Version: %{majmin}.0
Release: 2%{?dist}.bazzite.{{{ git_dir_version }}}
Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction
@ -14,11 +14,8 @@ URL: https://invent.kde.org/frameworks/%{framework}
Source0: https://download.kde.org/stable/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
## upstream patches (lookaside)
# https://invent.kde.org/frameworks/kio/-/merge_requests/1536
Patch0: expand-network-directories-in-file-picker.patch
# https://invent.kde.org/frameworks/kio/-/merge_requests/1556
Patch1: 1556.patch
Patch0: 1556.patch
## upstreamable patches
@ -299,6 +296,9 @@ rm %{buildroot}%{_datadir}/applications/kcm_trash.desktop
%{_kf5_libdir}/cmake/KF5KIO/
%changelog
* Sat Feb 10 2024 Marc Deop i Argemí <marcdeop@fedoraproject.org> - 5.115.0-1
- 5.115.0
* Sun Jan 14 2024 Alessandro Astone <ales.astone@gmail.com> - 5.113.0-2
- Backport patch to fix expanding network directories in file picker