Hello community, here is the log from the commit of package libkscreen2 for openSUSE:Factory checked in at 2020-02-29 21:22:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkscreen2 (Old) and /work/SRC/openSUSE:Factory/.libkscreen2.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkscreen2" Sat Feb 29 21:22:37 2020 rev:98 rq:779193 version:5.18.2 Changes: -------- --- /work/SRC/openSUSE:Factory/libkscreen2/libkscreen2.changes 2020-02-22 19:05:40.226254838 +0100 +++ /work/SRC/openSUSE:Factory/.libkscreen2.new.26092/libkscreen2.changes 2020-02-29 21:22:39.714296526 +0100 @@ -1,0 +2,12 @@ +Tue Feb 25 14:07:18 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.2.php +- Changes since 5.18.1: + * fix: handle when backend fails to load/initialize + * fix(kwayland): wait longer for connection timeout and retry (kde#416566) + * fix(kwayland): remove code with side-effects from Q_ASSERT (kde#413892) + +------------------------------------------------------------------- Old: ---- libkscreen-5.18.1.tar.xz libkscreen-5.18.1.tar.xz.sig New: ---- libkscreen-5.18.2.tar.xz libkscreen-5.18.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkscreen2.spec ++++++ --- /var/tmp/diff_new_pack.2EzrSJ/_old 2020-02-29 21:22:40.410297903 +0100 +++ /var/tmp/diff_new_pack.2EzrSJ/_new 2020-02-29 21:22:40.410297903 +0100 @@ -1,7 +1,7 @@ # # spec file for package libkscreen2 # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %bcond_without lang %define lname libKF5Screen7 Name: libkscreen2 -Version: 5.18.1 +Version: 5.18.2 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -28,7 +28,7 @@ Summary: KDE's screen management library License: GPL-2.0-or-later Group: System/GUI/KDE -Url: http://www.kde.org +URL: http://www.kde.org Source: https://download.kde.org/stable/plasma/%{version}/libkscreen-%{version}.tar.xz %if %{with lang} Source1: https://download.kde.org/stable/plasma/%{version}/libkscreen-%{version}.tar.xz.sig ++++++ libkscreen-5.18.1.tar.xz -> libkscreen-5.18.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.18.1/CMakeLists.txt new/libkscreen-5.18.2/CMakeLists.txt --- old/libkscreen-5.18.1/CMakeLists.txt 2020-02-18 14:10:24.000000000 +0100 +++ new/libkscreen-5.18.2/CMakeLists.txt 2020-02-25 14:15:36.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(libkscreen) -set(PROJECT_VERSION "5.18.1") +set(PROJECT_VERSION "5.18.2") set(QT_MIN_VERSION "5.12.0") set(KF5_MIN_VERSION "5.66.0") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.18.1/backends/kwayland/waylandbackend.cpp new/libkscreen-5.18.2/backends/kwayland/waylandbackend.cpp --- old/libkscreen-5.18.1/backends/kwayland/waylandbackend.cpp 2020-02-18 14:10:24.000000000 +0100 +++ new/libkscreen-5.18.2/backends/kwayland/waylandbackend.cpp 2020-02-25 14:15:36.000000000 +0100 @@ -35,7 +35,6 @@ WaylandBackend::WaylandBackend() : KScreen::AbstractBackend() - , m_isValid(true) , m_internalConfig(new WaylandConfig(this)) { qCDebug(KSCREEN_WAYLAND) << "Loading Wayland backend."; @@ -81,5 +80,5 @@ bool WaylandBackend::isValid() const { - return m_isValid; + return m_internalConfig->isInitialized(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.18.1/backends/kwayland/waylandbackend.h new/libkscreen-5.18.2/backends/kwayland/waylandbackend.h --- old/libkscreen-5.18.1/backends/kwayland/waylandbackend.h 2020-02-18 14:10:24.000000000 +0100 +++ new/libkscreen-5.18.2/backends/kwayland/waylandbackend.h 2020-02-25 14:15:36.000000000 +0100 @@ -45,7 +45,6 @@ QByteArray edid(int outputId) const override; private: - bool m_isValid; WaylandConfig *m_internalConfig; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.18.1/backends/kwayland/waylandconfig.cpp new/libkscreen-5.18.2/backends/kwayland/waylandconfig.cpp --- old/libkscreen-5.18.1/backends/kwayland/waylandconfig.cpp 2020-02-18 14:10:24.000000000 +0100 +++ new/libkscreen-5.18.2/backends/kwayland/waylandconfig.cpp 2020-02-25 14:15:36.000000000 +0100 @@ -51,7 +51,7 @@ initKWinTabletMode(); connect(this, &WaylandConfig::initialized, &m_syncLoop, &QEventLoop::quit); - QTimer::singleShot(1000, this, [this] { + QTimer::singleShot(3000, this, [this] { if (m_syncLoop.isRunning()) { qCWarning(KSCREEN_WAYLAND) << "Connection to Wayland server at socket:" << m_connection->socketName() << "timed out."; @@ -245,7 +245,8 @@ } // remove the output from output mapping - Q_ASSERT(m_outputMap.take(output->id()) == output); + const auto removedOutput = m_outputMap.take(output->id()); + Q_ASSERT(removedOutput == output); Q_UNUSED(removedOutput); m_screen->setOutputs(m_outputMap.values()); delete output; @@ -254,10 +255,18 @@ } } +bool WaylandConfig::isInitialized() const +{ + return !m_blockSignals + && m_registryInitialized + && m_initializingOutputs.isEmpty() + && m_outputMap.count() > 0 + && m_outputManagement != nullptr; +} + void WaylandConfig::checkInitialized() { - if (!m_blockSignals && m_registryInitialized && - m_initializingOutputs.isEmpty() && m_outputMap.count() && m_outputManagement != nullptr) { + if (isInitialized()) { m_screen->setOutputs(m_outputMap.values()); Q_EMIT initialized(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkscreen-5.18.1/backends/kwayland/waylandconfig.h new/libkscreen-5.18.2/backends/kwayland/waylandconfig.h --- old/libkscreen-5.18.1/backends/kwayland/waylandconfig.h 2020-02-18 14:10:24.000000000 +0100 +++ new/libkscreen-5.18.2/backends/kwayland/waylandconfig.h 2020-02-25 14:15:36.000000000 +0100 @@ -71,6 +71,8 @@ void applyConfig(const KScreen::ConfigPtr &newConfig); + bool isInitialized() const; + Q_SIGNALS: void configChanged(); void initialized();
