From d29b09d6e53e5f95a205b85190b933e262b2620a8ca975f1260033c0c84086db Mon Sep 17 00:00:00 2001
From: Wolfgang Bauer <wbauer@tmo.at>
Date: Tue, 16 Apr 2019 16:54:14 +0000
Subject: [PATCH] KDE Frameworks 5.57.0

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kcmutils?expand=0&rev=176
---
 ...that-pages-are-KCMs-in-KCMultiDialog.patch | 46 -------------------
 kcmutils-5.56.0.tar.xz                        |  3 --
 kcmutils-5.57.0.tar.xz                        |  3 ++
 kcmutils.changes                              | 16 +++++++
 kcmutils.spec                                 |  7 +--
 5 files changed, 21 insertions(+), 54 deletions(-)
 delete mode 100644 Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch
 delete mode 100644 kcmutils-5.56.0.tar.xz
 create mode 100644 kcmutils-5.57.0.tar.xz

diff --git a/Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch b/Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch
deleted file mode 100644
index 9e35f6a..0000000
--- a/Add-runtime-guard-that-pages-are-KCMs-in-KCMultiDialog.patch
+++ /dev/null
@@ -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
-
diff --git a/kcmutils-5.56.0.tar.xz b/kcmutils-5.56.0.tar.xz
deleted file mode 100644
index 80a5516..0000000
--- a/kcmutils-5.56.0.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7cf6a81818745852c38558160e3888bdd2a9bcce135aee53c3df99e939633ab8
-size 237148
diff --git a/kcmutils-5.57.0.tar.xz b/kcmutils-5.57.0.tar.xz
new file mode 100644
index 0000000..dbb4375
--- /dev/null
+++ b/kcmutils-5.57.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f3ee63a356e18be95a15141346356f3f43bb067d0326021d99f4b73ee4716fbb
+size 237884
diff --git a/kcmutils.changes b/kcmutils.changes
index f291f4c..a19feab 100644
--- a/kcmutils.changes
+++ b/kcmutils.changes
@@ -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
 
diff --git a/kcmutils.spec b/kcmutils.spec
index bcd715b..ef992c9 100644
--- a/kcmutils.spec
+++ b/kcmutils.spec
@@ -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