Accepting request 858310 from home:luca_b:branches:KDE:Frameworks5
- Add upstream patch to prevent crashing when using "apply to all" in the move/copy/overwrite dialog (kde#430374): * 0001-RenameDialog-Add-missing-nullptr-initialization.patch OBS-URL: https://build.opensuse.org/request/show/858310 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=316
This commit is contained in:
parent
10a950ce8b
commit
fe2eaffeac
29
0001-RenameDialog-Add-missing-nullptr-initialization.patch
Normal file
29
0001-RenameDialog-Add-missing-nullptr-initialization.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001
|
||||
From: Ismael Asensio <isma.af@gmail.com>
|
||||
Date: Tue, 22 Dec 2020 22:23:17 +0100
|
||||
Subject: [PATCH] RenameDialog: Add missing nullptr initialization
|
||||
|
||||
It fixes a crash when pressing `Apply to All` in those cases where
|
||||
the action was not present, as the code checks for nullptr
|
||||
|
||||
BUG: 430374
|
||||
FIXED-IN: 5.78
|
||||
---
|
||||
src/widgets/renamedialog.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/widgets/renamedialog.cpp b/src/widgets/renamedialog.cpp
|
||||
index ac1d91d2..c3e04753 100644
|
||||
--- a/src/widgets/renamedialog.cpp
|
||||
+++ b/src/widgets/renamedialog.cpp
|
||||
@@ -161,6 +161,7 @@ public:
|
||||
bCancel = nullptr;
|
||||
bRename = bSkip = nullptr;
|
||||
bOverwrite = nullptr;
|
||||
+ bOverwriteWhenOlder = nullptr;
|
||||
bResume = bSuggestNewName = nullptr;
|
||||
bApplyAll = nullptr;
|
||||
m_pLineEdit = nullptr;
|
||||
--
|
||||
2.29.2
|
||||
|
25
kio.changes
25
kio.changes
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Dec 22 22:11:18 UTC 2020 - Luca Beltrame <lbeltrame@kde.org>
|
||||
|
||||
- Add upstream patch to prevent crashing when using "apply to all"
|
||||
in the move/copy/overwrite dialog (kde#430374):
|
||||
* 0001-RenameDialog-Add-missing-nullptr-initialization.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 5 18:56:41 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
|
||||
@ -289,16 +296,16 @@ Wed Aug 7 17:51:31 UTC 2019 - Christophe Giboudeaux <christophe@krop.fr>
|
||||
* For more details please see:
|
||||
* https://www.kde.org/announcements/kde-frameworks-5.61.0.php
|
||||
- Changes since 5.60.0:
|
||||
* Remove explicit use of ECM_KDE_MODULE_DIR, is part of ECM_MODULE_PATH
|
||||
* Remove explicit use of ECM_KDE_MODULE_DIR, is part of ECM_MODULE_PATH
|
||||
* Use identical internet-services icon.
|
||||
* Stabilize test KFileWidgetTest::testDropFile
|
||||
* Add missing KIOWIDGETS_NO_DEPRECTAED check
|
||||
* Deprecate suggestName
|
||||
* Replace implementation of suggestName with KFileUtils::suggestName
|
||||
* Port internal usage of KIO::suggestName
|
||||
* Fix can't enter directory error on some FTP servers with Turkish locale (kde#409740)
|
||||
* Port from KRun::runService to KRun::runApplication
|
||||
* Fix compiler warnings about initialization order.
|
||||
* Stabilize test KFileWidgetTest::testDropFile
|
||||
* Add missing KIOWIDGETS_NO_DEPRECTAED check
|
||||
* Deprecate suggestName
|
||||
* Replace implementation of suggestName with KFileUtils::suggestName
|
||||
* Port internal usage of KIO::suggestName
|
||||
* Fix can't enter directory error on some FTP servers with Turkish locale (kde#409740)
|
||||
* Port from KRun::runService to KRun::runApplication
|
||||
* Fix compiler warnings about initialization order.
|
||||
* Look for protocols in the bin dir too, to fix the autotests
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
4
kio.spec
4
kio.spec
@ -35,8 +35,10 @@ Source1: https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-
|
||||
Source2: frameworks.keyring
|
||||
%endif
|
||||
Source99: baselibs.conf
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: 0001-RenameDialog-Add-missing-nullptr-initialization.patch
|
||||
# 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
|
||||
Patch100: kio_help-fallback-to-kde4-docs.patch
|
||||
BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version}
|
||||
BuildRequires: fdupes
|
||||
BuildRequires: kf5-filesystem
|
||||
|
Loading…
Reference in New Issue
Block a user