Accepting request 785302 from KDE:Frameworks5

KDE Frameworks 5.68

OBS-URL: https://build.opensuse.org/request/show/785302
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kcmutils?expand=0&rev=78

Check-activeModule-before-using-it.patch

@@ -1,32 +0,0 @@
-From ea7120ed901bf6161bb483ab73211a6491daac8f Mon Sep 17 00:00:00 2001
-From: Wolfgang Bauer <wbauer@tmo.at>
-Date: Sun, 16 Feb 2020 18:05:06 +0100
-Subject: Check activeModule before using it
-
-`activeModule` can be a nullptr here, as this is outside/after the
-`if (activeModule)`.
-This causes kontact to crash when opening its settings.
-
-BUG: 417396
-FIXED-IN: 5.68.0
-Differential Revision: https://phabricator.kde.org/D27433
----
- src/kcmultidialog.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/kcmultidialog.cpp b/src/kcmultidialog.cpp
-index 90da1c0..6a36ba5 100644
---- a/src/kcmultidialog.cpp
-+++ b/src/kcmultidialog.cpp
-@@ -181,7 +181,7 @@ void KCMultiDialogPrivate::_k_clientChanged()
- #endif
-     }
- 
--    auto buttons = activeModule->buttons();
-+    auto buttons = activeModule ? activeModule->buttons() : KCModule::NoAdditionalButton;
- 
-     QPushButton *resetButton = q->buttonBox()->button(QDialogButtonBox::Reset);
-     if (resetButton) {
--- 
-cgit v1.1
-

kcmutils-5.67.0.tar.xz

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

kcmutils-5.67.0.tar.xz.sig

@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl420R0ACgkQWNDuZIpI
-s7veYgf/bTi6pfDCuYwfefi3LSwfgbbjEPmMF9F37x8eZj8PHIr+n/piJnnD4Rcz
-Zyk4ClImZmixAbGOfti0/Zlx0XYsYlv2z436P8gheH4cRaxP5MZATzgr69e7mref
-gDgaM0ZFsGrSG5FGZcd35sLenC977wXG6iyLRxFURAQRmNuXKT5fBv/ch16JrwMb
-dIsneHhMM9YfXdQF4yK12cqOxJ/3DgH2ff9jpGzKxtYqpuCxZChnXS4pMlikC/zn
-lyRcvl1O5V2+pLNmbSzBDeV/kjnA1JGBHRLOUCmICemCNw+dBnXg3q2h6K7IurOF
-82xbUHtR8riZukNhQsp4xdfI0diFGg==
-=ygpe
------END PGP SIGNATURE-----

kcmutils-5.68.0.tar.xz

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

kcmutils-5.68.0.tar.xz.sig

@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEEU+a0e0XOo+DVt0V3WNDuZIpIs7sFAl5jlwMACgkQWNDuZIpI
+s7s0Lwf/XBqnbOBh5zA9oY724W85HHz8ybqC3uVXU0eaOT86Gmwfb0fMLMmijEiP
+N8Pf/V+KbJuXV6ZbBYH/B854VDy1c27NLeX0kFIhjFruOuyOqNGKwcF8ZXazLhCP
+fPt8Qv+ytS/4baQQ3XNOxMDQbwiZpIwamgaWc9YSEfYjim6/w1mITPiUenYxS3/x
+A+/DaOiDPMpPQeUxJGDNgZsTOJqHKJdofivMqoLlRJQ5TIHYsK60gaUp/aKJuSCJ
+pNrZT6zUlyUYhEJsWG3g63kkWFNayQr5GYHMedtYiLlcps3VxAj4gJqJw9VpV1uj
+khDhwOgo8d9Xihz6PO54inwctghuFg==
+=4tF7
+-----END PGP SIGNATURE-----

kcmutils.changes

@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Mar  8 09:17:37 UTC 2020 - Christophe Giboudeaux <christophe@krop.fr>
+
+- Update to 5.68.0
+  * New feature release
+  * For more details please see:
+  * https://www.kde.org/announcements/kde-frameworks-5.68.0.php
+- Changes since 5.67.0:
+  * Make it compile against qt5.15. SkipEmptyParts is part of Qt::.
+  * Check activeModule before using it (kde#417396)
+- Drop Check-activeModule-before-using-it.patch
+
 -------------------------------------------------------------------
 Sun Feb 16 17:10:45 UTC 2020 - Wolfgang Bauer <wbauer@tmo.at>
 

kcmutils.spec

@@ -17,14 +17,14 @@
 
 
 %define lname   libKF5KCMUtils5
-%define _tar_path 5.67
+%define _tar_path 5.68
 # 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.67.0
+Version:        5.68.0
 Release:        0
 Summary:        Classes to work with KCModules
 License:        LGPL-2.1-or-later
@@ -36,8 +36,6 @@ Source1:        https://download.kde.org/stable/frameworks/%{_tar_path}/%{name}-
 Source2:        frameworks.keyring
 %endif
 Source99:       baselibs.conf
-# PATCH-FIX-UPSTREAM
-Patch:          Check-activeModule-before-using-it.patch
 BuildRequires:  cmake >= 3.5
 BuildRequires:  extra-cmake-modules >= %{_kf5_bugfix_version}
 BuildRequires:  fdupes
@@ -89,7 +87,6 @@ created with the KConfigWidgets framework. Development files.
 
 %prep
 %setup -q
-%autopatch -p1
 
 %build
   %cmake_kf5 -d build