diff --git a/.gitignore b/.gitignore index 9a6c669..136cd14 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ /libkscreen-5.18.0.tar.xz /libkscreen-5.18.1.tar.xz /libkscreen-5.18.2.tar.xz +/libkscreen-5.18.3.tar.xz diff --git a/libkscreen-handle-when-backend-fails-to-load.patch b/libkscreen-handle-when-backend-fails-to-load.patch deleted file mode 100644 index 38e6b4d..0000000 --- a/libkscreen-handle-when-backend-fails-to-load.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 069bb65af0d0059391323f9ffd2edd9162d57588 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= -Date: Mon, 24 Feb 2020 15:12:30 +0100 -Subject: fix: handle when backend fails to load/initialize - -Summary: -Fixes a null pointer dereference in GetConfigOperation when BackendManager -fails to load a valid backend. - -Reviewers: #plasma - -Subscribers: plasma-devel - -Tags: #plasma - -Differential Revision: https://phabricator.kde.org/D27625 ---- - src/getconfigoperation.cpp | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/getconfigoperation.cpp b/src/getconfigoperation.cpp -index 4cb9afb..f985845 100644 ---- a/src/getconfigoperation.cpp -+++ b/src/getconfigoperation.cpp -@@ -171,6 +171,9 @@ void GetConfigOperation::start() - Q_D(GetConfigOperation); - if (BackendManager::instance()->method() == BackendManager::InProcess) { - auto backend = d->loadBackend(); -+ if (!backend) { -+ return; // loadBackend() already set error and called emitResult() for us -+ } - d->config = backend->config()->clone(); - d->loadEdid(backend); - emitResult(); --- -cgit v1.1 diff --git a/libkscreen-qt5.spec b/libkscreen-qt5.spec index 3c17d4f..075ae7b 100644 --- a/libkscreen-qt5.spec +++ b/libkscreen-qt5.spec @@ -2,8 +2,8 @@ Name: libkscreen-qt5 Summary: KDE display configuration library -Version: 5.18.2 -Release: 2%{?dist} +Version: 5.18.3 +Release: 1%{?dist} License: GPLv2+ URL: https://cgit.kde.org/%{base_name}.git @@ -16,7 +16,6 @@ URL: https://cgit.kde.org/%{base_name}.git %endif Source0: http://download.kde.org/%{stable}/plasma/%{version}/%{base_name}-%{version}.tar.xz Patch1: libkscreen-5.6.4-rhel-nowayland.patch -Patch2: libkscreen-handle-when-backend-fails-to-load.patch # filter plugin provides %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$ @@ -59,7 +58,6 @@ developing applications that use %{name}. %if 0%{?rhel} && 0%{?rhel} <= 7 %patch1 -p1 -b .nowayland %endif -%patch2 -p1 -b .handle-when-backend-fails-to-load %build @@ -97,6 +95,9 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %changelog +* Tue Mar 10 2020 Jan Grulich - 5.18.3-1 +- 5.18.3 + * Fri Feb 28 2020 Jan Grulich - 5.18.2-2 - Handle when backend fails to load/initialize diff --git a/sources b/sources index a3f0417..e9d5f9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libkscreen-5.18.2.tar.xz) = fba933c4b26a32f19a6352738e3704f8a35ad24b268bed6fca173c2c4abe0b899845ce1750ce6473b3b9185239332980384a8bb708081484162ee30ff4b3e29a +SHA512 (libkscreen-5.18.3.tar.xz) = d1e034067c95da830f056186f275c3daf74a9bac9e4903d3837f03c5d98f79e0cdf888d937efa0d700a2e316c49f1cfc9bdeacc8ca1b06eba2f52ff09784601f