Accepting request 1094137 from home:Vogtinator:branches:KDE:Frameworks5
- Add patch to fix crash on thumbnail generation (kde#470845): * 0001-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch OBS-URL: https://build.opensuse.org/request/show/1094137 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=388
This commit is contained in:
parent
7659b248fb
commit
6f56cb0c1f
@ -0,0 +1,32 @@
|
|||||||
|
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
|
||||||
|
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 20 17:17:11 UTC 2023 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||||
|
|
||||||
|
- Add patch to fix crash on thumbnail generation (kde#470845):
|
||||||
|
* 0001-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jun 5 07:44:02 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
Mon Jun 5 07:44:02 UTC 2023 - Christophe Marin <christophe@krop.fr>
|
||||||
|
|
||||||
|
6
kio.spec
6
kio.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package kio
|
# spec file for package kio
|
||||||
#
|
#
|
||||||
# Copyright (c) 2022 SUSE LLC
|
# Copyright (c) 2023 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -35,12 +35,14 @@ Source2: frameworks.keyring
|
|||||||
%endif
|
%endif
|
||||||
# PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5
|
# 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
|
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: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
# gcc7 is too old for std::transform_reduce
|
# gcc7 is too old for std::transform_reduce
|
||||||
%if 0%{?suse_version} == 1500
|
%if 0%{?suse_version} == 1500
|
||||||
BuildRequires: gcc10-c++
|
|
||||||
BuildRequires: gcc10-PIE
|
BuildRequires: gcc10-PIE
|
||||||
|
BuildRequires: gcc10-c++
|
||||||
%endif
|
%endif
|
||||||
BuildRequires: kf5-filesystem
|
BuildRequires: kf5-filesystem
|
||||||
BuildRequires: krb5-devel
|
BuildRequires: krb5-devel
|
||||||
|
Loading…
Reference in New Issue
Block a user