Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kio for openSUSE:Factory checked in
at 2023-06-21 22:37:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kio (Old)
and /work/SRC/openSUSE:Factory/.kio.new.15902 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio"
Wed Jun 21 22:37:20 2023 rev:142 rq:1094140 version:5.107.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/kio/kio.changes 2023-06-11 19:55:51.787370608
+0200
+++ /work/SRC/openSUSE:Factory/.kio.new.15902/kio.changes 2023-06-21
22:37:35.001549397 +0200
@@ -1,0 +2,6 @@
+Tue Jun 20 17:17:11 UTC 2023 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Add patch to fix crash on thumbnail generation (kde#470845):
+ * 0001-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch
+
+-------------------------------------------------------------------
New:
----
0001-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kio.spec ++++++
--- /var/tmp/diff_new_pack.xu2N0W/_old 2023-06-21 22:37:35.601553008 +0200
+++ /var/tmp/diff_new_pack.xu2N0W/_new 2023-06-21 22:37:35.605553032 +0200
@@ -1,7 +1,7 @@
#
# 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
# remain the property of their copyright owners, unless otherwise agreed
@@ -35,12 +35,14 @@
%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-c++
BuildRequires: gcc10-PIE
+BuildRequires: gcc10-c++
%endif
BuildRequires: kf5-filesystem
BuildRequires: krb5-devel
++++++ 0001-previewjob-Check-whether-thumbRootDevice-is-valid-be.patch ++++++
>From daa0b06ae8621f731327b547f268bddc9784001b Mon Sep 17 00:00:00 2001
From: Nicolas Fella <nicolas.fe...@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
