Accepting request 1118703 from KDE:Frameworks5
KDE Frameworks 5.111.0. Public release next weekend (forwarded request 1116638 from krop) OBS-URL: https://build.opensuse.org/request/show/1118703 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=147
This commit is contained in:
commit
279b175aeb
@ -1,28 +0,0 @@
|
||||
From 48322f44323a1fc09305d66d9093fe6c3780709e Mon Sep 17 00:00:00 2001
|
||||
From: Kevin Ottens <kevin.ottens@enioka.com>
|
||||
Date: Fri, 15 Sep 2023 09:45:58 +0200
|
||||
Subject: [PATCH] Don't crash if KMountPoint gives nothing back while checking
|
||||
for CIFS
|
||||
|
||||
BUG: 474451
|
||||
---
|
||||
src/ioslaves/file/file_unix.cpp | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp
|
||||
index 87c47e7e7..c0bc64354 100644
|
||||
--- a/src/ioslaves/file/file_unix.cpp
|
||||
+++ b/src/ioslaves/file/file_unix.cpp
|
||||
@@ -328,6 +328,9 @@ inline static time_t stat_mtime(const QT_STATBUF &buf)
|
||||
static bool isOnCifsMount(const QString &filePath)
|
||||
{
|
||||
const auto mount = KMountPoint::currentMountPoints().findByPath(filePath);
|
||||
+ if (!mount) {
|
||||
+ return false;
|
||||
+ }
|
||||
return mount->mountType() == QStringLiteral("cifs") || mount->mountType() == QStringLiteral("smb3");
|
||||
}
|
||||
|
||||
--
|
||||
2.42.0
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:228f9abcdfce1b23deacca97e9dd68d019e6b20607ddfe2295050333e90fc96b
|
||||
size 3795996
|
@ -1,11 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmT0QA0ACgkQWNDuZIpI
|
||||
s7tt/wf9GZnvJE04GflHS3djuAcU4R4FIDo/9IapjPTNJTKUeQkQ/GjXV/7BjryM
|
||||
/nw4bpAansQp7y2MLI+4nk1F2AENTuw5xfOAbv64iTeYVvfGnLn1R2zohiugta8Q
|
||||
v0nqE+HSNmknoGbzHiV+IlpJh1LgFAgXG/NMq8EnFf1WVriz0n8ZtgEVRp6/ezq/
|
||||
TgKvC2LvrIIWFRsDWSUNERi9vt9//k8nCkLBhDuex49hwveU4DiG8WmFkYuMBmEQ
|
||||
iHdrG8w9fHghkvO8c/z0ulaQwifrUB5HAu3n6zVROaz5pNSfWpkvNl9N6PgkZCkF
|
||||
olOdh0ac7hQG5jZGPWRfOWqU4Gl29w==
|
||||
=SFyI
|
||||
-----END PGP SIGNATURE-----
|
3
kio-5.111.0.tar.xz
Normal file
3
kio-5.111.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:51bfd270942bcd80d8c3bfb72ee299d4d04a257f496b1843d9335d0db9afd045
|
||||
size 3798160
|
11
kio-5.111.0.tar.xz.sig
Normal file
11
kio-5.111.0.tar.xz.sig
Normal file
@ -0,0 +1,11 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmUhN8IACgkQWNDuZIpI
|
||||
s7v22gf9HwqluuDbkF6DHfMfu1FmdZyJGkcy2gTNAZqGQY64xx96lr9bl9Pj3CDw
|
||||
mY878ezm4rdA3Asnbv47sq9oumOqvz3ncOgShx1+vXAYMxe34XKKV2l4dzOOKIgH
|
||||
mkCvCBULAx1RtLJRopD8If+3b3ry8uP5qfFhAWC8hYtdMhEYj7tYDzcnF8Ei69aT
|
||||
SslR+W1ZS7leCY+wDA7yuK8EvnodXLonNBPtCLrBLXZ2jc+9uaA9sgbvuBg3gzsy
|
||||
FdbAzziswHrFKS8JGnshf/L8Glrfu8kdIpeQOK51Jk2QRgRys/fn+zxOOTZ7peY7
|
||||
Dt7cIYEjKILs8epoE4MDBXB9BMfOQg==
|
||||
=41Zt
|
||||
-----END PGP SIGNATURE-----
|
20
kio.changes
20
kio.changes
@ -1,3 +1,23 @@
|
||||
-------------------------------------------------------------------
|
||||
Mon Oct 9 20:20:58 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 5.111.0
|
||||
* New feature release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/frameworks/5/5.111.0
|
||||
- Changes since 5.110.0:
|
||||
* dbusactivationrunner: only activate well-formed services (kde#475266)
|
||||
* DBusActivationRunner: fix object path according to spec
|
||||
* Undeprecate KCoreDirLister::setMimeExcludeFilter
|
||||
* Fix incomplete error strings in MimeTypeFinderJob
|
||||
* Don't crash if KMountPoint gives nothing back while checking for CIFS (kde#474451)
|
||||
* trashimpl: optimize TrashSizeCache::calculateSize
|
||||
* trash: Optimize trashimpl::adaptTrashSize
|
||||
* [kfilewidget] Fixing saving to files with quotes (kde#426728)
|
||||
* KPropertiesDialog: Force PlainText on size label
|
||||
- Drop patch, merged upstream:
|
||||
* 0001-Don-t-crash-if-KMountPoint-gives-nothing-back-while-.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Sep 18 18:44:06 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
4
kio.spec
4
kio.spec
@ -23,7 +23,7 @@
|
||||
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
|
||||
%bcond_without released
|
||||
Name: kio
|
||||
Version: 5.110.0
|
||||
Version: 5.111.0
|
||||
Release: 0
|
||||
Summary: Network transparent access to files and data
|
||||
License: LGPL-2.1-or-later
|
||||
@ -35,8 +35,6 @@ Source2: frameworks.keyring
|
||||
%endif
|
||||
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
|
||||
Patch0: kio_help-fallback-to-kde4-docs.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0001-Don-t-crash-if-KMountPoint-gives-nothing-back-while-.patch
|
||||
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||
BuildRequires: fdupes
|
||||
# gcc7 is too old for std::transform_reduce
|
||||
|
Loading…
Reference in New Issue
Block a user