Hello community, here is the log from the commit of package kcmutils for openSUSE:Factory checked in at 2019-03-26 15:37:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kcmutils (Old) and /work/SRC/openSUSE:Factory/.kcmutils.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kcmutils" Tue Mar 26 15:37:11 2019 rev:65 rq:687644 version:5.56.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kcmutils/kcmutils.changes 2019-03-21 09:44:26.298923279 +0100 +++ /work/SRC/openSUSE:Factory/.kcmutils.new.25356/kcmutils.changes 2019-03-26 15:37:14.372376665 +0100 @@ -1,0 +2,6 @@ +Wed Mar 20 17:03:22 UTC 2019 - [email protected] + +- Add Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch + to fix Kontact crash when opening its settings (kde#405440) + +------------------------------------------------------------------- New: ---- Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kcmutils.spec ++++++ --- /var/tmp/diff_new_pack.9WfRXU/_old 2019-03-26 15:37:15.144376352 +0100 +++ /var/tmp/diff_new_pack.9WfRXU/_new 2019-03-26 15:37:15.144376352 +0100 @@ -32,6 +32,8 @@ URL: https://www.kde.org Source: http://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-%{version}.tar.xz Source1: baselibs.conf +# PATCH-FIX-UPSTREAM +Patch0: Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -86,6 +88,7 @@ %if 0%{?suse_version} == 1500 sed -i -e "s/^set *(REQUIRED_QT_VERSION 5.10.0)$/set(REQUIRED_QT_VERSION 5.9.0)/" CMakeLists.txt %endif +%autopatch -p1 %build %cmake_kf5 -d build ++++++ Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch ++++++ >From d9ddd3524535ecb5debc2157ddf02922b6bb1685 Mon Sep 17 00:00:00 2001 From: David Edmundson <[email protected]> Date: Tue, 19 Mar 2019 18:23:24 +0100 Subject: Add runtime guard that pages are KCMs in KCMultiDialog Summary: This situation can come up if a KCMultiDialog subclass adds pages directly that aren't KCModules. BUG: 405440 Test Plan: acheronuk tested this patch on a crashing example Subscribers: kde-frameworks-devel Tags: #frameworks Differential Revision: https://phabricator.kde.org/D19888 --- src/kcmultidialog.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/kcmultidialog.cpp b/src/kcmultidialog.cpp index 9ddd43b..b689f27 100644 --- a/src/kcmultidialog.cpp +++ b/src/kcmultidialog.cpp @@ -99,7 +99,6 @@ void KCMultiDialogPrivate::_k_slotCurrentPageChanged(KPageWidgetItem *current, K currentModule = modules[i].kcm; } } - Q_ASSERT(currentModule); // For some reason the KCModuleQml modules handle their own margin internally // to match that we need to adjust the spacing of our page widget @@ -108,7 +107,7 @@ void KCMultiDialogPrivate::_k_slotCurrentPageChanged(KPageWidgetItem *current, K // TODO KF6 Fix this situation. - if (currentModule->realModule() && currentModule->realModule()->inherits("KCModuleQml")) { + if (currentModule && currentModule->realModule() && currentModule->realModule()->inherits("KCModuleQml")) { bool padHackLeft = false; bool padHackRight = false; if (q->pageWidget()->model()->rowCount() < 2) { -- cgit v1.1
