pool/kcmutils
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KDE Frameworks 5.57.0

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=176
This commit is contained in:
Wolfgang Bauer 2019-04-16 16:54:14 +00:00 committed by Git OBS Bridge
parent 2dc1942680
commit d29b09d6e5
5 changed files with 21 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch
View File

@ -1,46 +0,0 @@
From d9ddd3524535ecb5debc2157ddf02922b6bb1685 Mon Sep 17 00:00:00 2001
From: David Edmundson <kde@davidedmundson.co.uk>
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

3
kcmutils-5.56.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7cf6a81818745852c38558160e3888bdd2a9bcce135aee53c3df99e939633ab8
size 237148

3
kcmutils-5.57.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f3ee63a356e18be95a15141346356f3f43bb067d0326021d99f4b73ee4716fbb
size 237884

16
kcmutils.changes
View File

@ -1,3 +1,19 @@
-------------------------------------------------------------------
Sun Apr 14 20:21:42 UTC 2019 - lbeltrame@kde.org
- Update to 5.57.0
* New feature release
* For more details please see:
* https://www.kde.org/announcements/kde-frameworks-5.57.0.php
- Changes since 5.56.0:
* [KCModuleLoader] Pass args to created KQuickAddons::ConfigModule
* Pass focus to child searchbar when KPluginSelector is focused
* [KCMUTILS] compile without foreach
* Improve the KCM error message
* Add runtime guard that pages are KCMs in KCMultiDialog (kde#405440)
- Dropped patches, now upstream:
* Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch
-------------------------------------------------------------------
Wed Mar 20 17:03:22 UTC 2019 - wbauer@tmo.at

7
kcmutils.spec
View File

@ -17,14 +17,14 @@
%define lname libKF5KCMUtils5
%define _tar_path 5.56
%define _tar_path 5.57
# Full KF5 version (e.g. 5.33.0)
%{!?_kf5_version: %global _kf5_version %{version}}
# Last major and minor KF5 version (e.g. 5.33)
%{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')}
%bcond_without lang
Name: kcmutils
Version: 5.56.0
Version: 5.57.0
Release: 0
Summary: Classes to work with KCModules
License: LGPL-2.1-or-later
@ -32,8 +32,6 @@ Group: System/GUI/KDE
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
@ -88,7 +86,6 @@ created with the KConfigWidgets framework. Development files.
%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