diff --git a/0001-RenameDialog-Add-missing-nullptr-initialization.patch b/0001-RenameDialog-Add-missing-nullptr-initialization.patch new file mode 100644 index 0000000..d2a4633 --- /dev/null +++ b/0001-RenameDialog-Add-missing-nullptr-initialization.patch @@ -0,0 +1,29 @@ +From 9dc9e26b9196111eeacb5609b36957f74f5a14c4 Mon Sep 17 00:00:00 2001 +From: Ismael Asensio +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 + diff --git a/kio.changes b/kio.changes index ee5e6cd..2071e69 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Dec 22 22:11:18 UTC 2020 - Luca Beltrame + +- 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 @@ -289,16 +296,16 @@ Wed Aug 7 17:51:31 UTC 2019 - Christophe Giboudeaux * 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 ------------------------------------------------------------------- diff --git a/kio.spec b/kio.spec index 27bf8d0..f7ad954 100644 --- a/kio.spec +++ b/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