Accepting request 1097705 from KDE:Frameworks5

KDE Frameworks 5.108.0 (forwarded request 1097055 from krop) OBS-URL: https://build.opensuse.org/request/show/1097705 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio?expand=0&rev=143
2023-07-09 18:40:01 +00:00 · 2023-07-09 18:40:01 +00:00 · a28e32c243
commit a28e32c243
parent 1b0f66550c 95937b672f
7 changed files with 36 additions and 51 deletions
--- a/0001-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch
+++ b/0001-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch
@ -1,32 +0,0 @@
-From daa0b06ae8621f731327b547f268bddc9784001b Mon Sep 17 00:00:00 2001
-From: Nicolas Fella <nicolas.fella@gmx.de>
-Date: Sat, 10 Jun 2023 14:49:30 +0200
-Subject: [PATCH] [previewjob] Check whether thumbRootDevice is valid before
- access
-
-storageAccessFromPath may return an invalid device, e.g. because the thumbnail directory doesn't exist yet
-
-In that case we must not use the device
-
-BUG: 470845
-(cherry picked from commit 3fdcb7bcdae3a3dc95ce5b3d15740802450b129e)
---
- src/widgets/previewjob.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/widgets/previewjob.cpp b/src/widgets/previewjob.cpp
-index cffdce302..214e3b3b3 100644
--- a/src/widgets/previewjob.cpp
-+++ b/src/widgets/previewjob.cpp
-@@ -829,7 +829,7 @@ PreviewJobPrivate::CachePolicy PreviewJobPrivate::canBeCached(const QString &pat
-             // Or, if the checked device is unencrypted, allow thumbnailing.
-             if (device.as<Solid::StorageAccess>()->isEncrypted()) {
-                 const Solid::Device thumbRootDevice = Solid::Device::storageAccessFromPath(thumbRoot);
-                shouldAllow = thumbRootDevice.as<Solid::StorageAccess>()->isEncrypted();
-+                shouldAllow = thumbRootDevice.isValid() && thumbRootDevice.as<Solid::StorageAccess>()->isEncrypted();
-             } else {
-                 shouldAllow = true;
-             }
-- 
-2.41.0
-
--- a/kio-5.107.0.tar.xz
+++ b/kio-5.107.0.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:456a1856830c21e9a61181c22c0e14510ad6a4498da0684afc05761142ac48ae
-size 3771692
--- a/kio-5.107.0.tar.xz.sig
+++ b/kio-5.107.0.tar.xz.sig
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmR7GhUACgkQWNDuZIpI
-s7uBJAgAtrW+Asc6BK2GWSH9XtR8+dE8wiVDo8KyMtxB6cBbRKQHehmT1O+0DouK
-Tt9naecJReablIUiIBc9zxsa5hBZOAN+suo0vPVry9UKJ8djpZMlbA6/Dw8b+Y+Q
-I307FLPUXeNbgdmDEM1ZrKYrsTKzQqxY+juMdIiQZri8tBTrIYlRbvC8NzpWMeVj
-fB3K7Tbeml9phJa4OTqWugRx3Oi85EVWrjHVsllsnBBiiweOfmaf9ISqOG59vnCP
-wYNA1tWKeop/l7tVkTkOj/b4IW6Rs1NQLyscA7BnggactYjifSFxwuxOWch3wvVr
-U3ncQVPF3THpzLNz8+5UgDsejMG5vw==
-=YjLm
-----END PGP SIGNATURE-----
--- a/kio-5.108.0.tar.xz
+++ b/kio-5.108.0.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:42044674b206c79bf8c9a40a91c7eaf754fff473d7b13fdb6efc160d92bcabec
+size 3778556
--- a/kio-5.108.0.tar.xz.sig
+++ b/kio-5.108.0.tar.xz.sig
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAmShLtsACgkQWNDuZIpI
+s7vGiwf8D5B3hG54GJ0MZzbmIO8f5+744AkeOiOerdvNd2UO3oSO6fie7KLhoTX+
+Tok3Gaa3UFeUvRJANUH1ORiiCwX6O1XPzScanpzE3gDVJa1nW79kx8FGEZa2De47
+qU01AIpMA+FfbO5litMt0ID8drPDHcSNvc1ric3ZsKtKI+74ai0nIDm08U4caKmD
+WyvRK/BhLKWZ5Iao07UGmZHig+W4BLYLIlzUg7PX0DmBAndARnALm2d+hilHJIMw
+Lk+CM1RkV7M/5Swr1lfp/+AHjhMIHTGHIdbfx0gTph4GqagZ1gDXkISOl4OO9bCg
+YF87GgtmO/mCroI3DfAUkGty1T0VLw==
+=AdZn
+-----END PGP SIGNATURE-----
--- a/kio.changes
+++ b/kio.changes
@ -1,3 +1,22 @@
+-------------------------------------------------------------------
+Mon Jul  3 07:01:50 UTC 2023 - Christophe Marin <christophe@krop.fr>
+
+- Update to 5.108.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/frameworks/5/5.108.0
+- Changes since 5.107.0:
+  * Remove qt6 CI builds
+  * KUrlRequester: restore unnamed filter compatibility with Plasma file dialog
+  * KUrlRequester::setFilter: note syntax change in compiler deprecation warning
+  * Add KUrlRequester::nameFilters, deprecate KUrlRequester::filter (kde#369542)
+  * KUrlRequester::setFilter: note special filter syntax, allow unnamed filters
+  * KCoreDirLister::nameFilter: revert to non-partial matching again
+  * filewidgets/kfilewidget: Select and focus filename after canceling overwrite (kde#444515)
+  * [previewjob] Check whether thumbRootDevice is valid before access (kde#470845)
+- Drop patch, merged upstream:
+  * 0001-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch
+
 -------------------------------------------------------------------
 Tue Jun 20 17:17:11 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>

--- a/kio.spec
+++ b/kio.spec
@ -1,7 +1,7 @@
 #
 # spec file for package kio
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@ -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.107.0
+Version:        5.108.0
 Release:        0
 Summary:        Network transparent access to files and data
 License:        LGPL-2.1-or-later
@ -35,14 +35,12 @@ 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-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch
 BuildRequires:  extra-cmake-modules >= %{_kf5_bugfix_version}
 BuildRequires:  fdupes
 # gcc7 is too old for std::transform_reduce
 %if 0%{?suse_version} == 1500
-BuildRequires:  gcc10-PIE
 BuildRequires:  gcc10-c++
+BuildRequires:  gcc10-PIE
 %endif
 BuildRequires:  kf5-filesystem
 BuildRequires:  krb5-devel