Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kwayland-integration for
openSUSE:Factory checked in at 2022-06-13 13:02:16
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwayland-integration (Old)
and /work/SRC/openSUSE:Factory/.kwayland-integration.new.1548 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland-integration"
Mon Jun 13 13:02:16 2022 rev:120 rq:981911 version:5.25.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kwayland-integration/kwayland-integration.changes
2022-05-05 23:05:06.961461629 +0200
+++
/work/SRC/openSUSE:Factory/.kwayland-integration.new.1548/kwayland-integration.changes
2022-06-13 13:02:31.597116688 +0200
@@ -1,0 +2,24 @@
+Thu Jun 9 11:14:59 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 5.25.0
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.25.0
+- Changes since 5.24.90:
+ * Remove KGuiAddons dependency
+
+-------------------------------------------------------------------
+Thu May 19 19:45:31 UTC 2022 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 5.24.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.24.90
+- Changes since 5.24.5:
+ * Ensure that xdgActivationTokenArrived is not emitted directly from
requestXdgActivationToken
+ * Finalize the Qt6/KF6 port and add Qt6 CI
+ * Remove modifierkeyinfo plugin
+ * Adapt build system for building against qt6
+ * Prevent double deletion of shmpools (kde#443706)
+
+-------------------------------------------------------------------
Old:
----
kwayland-integration-5.24.5.tar.xz
kwayland-integration-5.24.5.tar.xz.sig
New:
----
kwayland-integration-5.25.0.tar.xz
kwayland-integration-5.25.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwayland-integration.spec ++++++
--- /var/tmp/diff_new_pack.Zcdva8/_old 2022-06-13 13:02:32.089117375 +0200
+++ /var/tmp/diff_new_pack.Zcdva8/_new 2022-06-13 13:02:32.093117381 +0200
@@ -18,7 +18,7 @@
%bcond_without released
Name: kwayland-integration
-Version: 5.24.5
+Version: 5.25.0
Release: 0
# Full Plasma 5 version (e.g. 5.8.95)
%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}}
@@ -28,9 +28,9 @@
License: LGPL-2.1-or-later
Group: Development/Libraries/KDE
URL: http://www.kde.org
-Source:
https://download.kde.org/stable/plasma/%{version}/kwayland-integration-%{version}.tar.xz
+Source: kwayland-integration-%{version}.tar.xz
%if %{with released}
-Source1:
https://download.kde.org/stable/plasma/%{version}/kwayland-integration-%{version}.tar.xz.sig
+Source1: kwayland-integration-%{version}.tar.xz.sig
Source2: plasma.keyring
%endif
BuildRequires: cmake >= 3.16
++++++ kwayland-integration-5.24.5.tar.xz -> kwayland-integration-5.25.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.24.5/.gitlab-ci.yml
new/kwayland-integration-5.25.0/.gitlab-ci.yml
--- old/kwayland-integration-5.24.5/.gitlab-ci.yml 2022-05-03
12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/.gitlab-ci.yml 2022-06-09
11:10:07.000000000 +0200
@@ -4,3 +4,4 @@
include:
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux.yml
-
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/freebsd.yml
+ -
https://invent.kde.org/sysadmin/ci-utilities/raw/master/gitlab-templates/linux-qt6.yml
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.24.5/CMakeLists.txt
new/kwayland-integration-5.25.0/CMakeLists.txt
--- old/kwayland-integration-5.24.5/CMakeLists.txt 2022-05-03
12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/CMakeLists.txt 2022-06-09
11:10:07.000000000 +0200
@@ -2,12 +2,12 @@
set(CMAKE_C_STANDARD 99)
-set(PROJECT_VERSION "5.24.5")
+set(PROJECT_VERSION "5.25.0")
set(PROJECT_VERSION_MAJOR 5)
cmake_minimum_required(VERSION 3.16)
set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.86")
+set(KF5_MIN_VERSION "5.90")
set(KDE_COMPILERSETTINGS_LEVEL "5.82")
set(CMAKE_CXX_STANDARD 17)
@@ -15,19 +15,10 @@
find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE)
-include(FeatureSummary)
-
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is
checked
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} )
-
-find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
- Core
- Widgets
- WaylandClient
- XkbCommonSupport # Needed by Qt5::WaylandClientPrivate
-)
-
+include(FeatureSummary)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings NO_POLICY_SCOPE)
@@ -35,15 +26,24 @@
include(KDEClangFormat)
include(KDEGitCommitHooks)
+find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ Core
+ Widgets
+ WaylandClient
+)
+
# required frameworks
find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
IdleTime
WindowSystem
- GuiAddons
Wayland
)
-find_package(QtWaylandScanner REQUIRED)
+if (QT_MAJOR_VERSION EQUAL "5")
+ find_package(QtWaylandScanner REQUIRED)
+ find_package(Qt5XkbCommonSupport REQUIRED) # Needed by
Qt5::WaylandClientPrivate
+endif()
+
find_package(WaylandProtocols 1.21 REQUIRED)
find_package(Wayland 1.15 COMPONENTS Client)
find_package(PkgConfig REQUIRED)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.24.5/autotests/CMakeLists.txt
new/kwayland-integration-5.25.0/autotests/CMakeLists.txt
--- old/kwayland-integration-5.24.5/autotests/CMakeLists.txt 2022-05-03
12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/autotests/CMakeLists.txt 2022-06-09
11:10:07.000000000 +0200
@@ -1,4 +1,4 @@
include(ECMMarkAsTest)
-find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
+find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test)
add_subdirectory(idletime)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.24.5/src/CMakeLists.txt
new/kwayland-integration-5.25.0/src/CMakeLists.txt
--- old/kwayland-integration-5.24.5/src/CMakeLists.txt 2022-05-03
12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/CMakeLists.txt 2022-06-09
11:10:07.000000000 +0200
@@ -1,3 +1,2 @@
add_subdirectory(idletime)
add_subdirectory(windowsystem)
-add_subdirectory(kmodifierkeyinfoprovider)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/idletime/CMakeLists.txt
new/kwayland-integration-5.25.0/src/idletime/CMakeLists.txt
--- old/kwayland-integration-5.24.5/src/idletime/CMakeLists.txt 2022-05-03
12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/idletime/CMakeLists.txt 2022-06-09
11:10:07.000000000 +0200
@@ -13,5 +13,5 @@
TARGETS
KF5IdleTimeKWaylandPlugin
DESTINATION
- ${KDE_INSTALL_PLUGINDIR}/kf5/org.kde.kidletime.platforms/
+
${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/org.kde.kidletime.platforms/
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.24.5/src/idletime/poller.h
new/kwayland-integration-5.25.0/src/idletime/poller.h
--- old/kwayland-integration-5.24.5/src/idletime/poller.h 2022-05-03
12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/idletime/poller.h 2022-06-09
11:10:07.000000000 +0200
@@ -6,7 +6,7 @@
#ifndef POLLER_H
#define POLLER_H
-#include <KIdleTime/private/abstractsystempoller.h>
+#include <private/abstractsystempoller.h>
#include <QHash>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/kmodifierkeyinfoprovider/CMakeLists.txt
new/kwayland-integration-5.25.0/src/kmodifierkeyinfoprovider/CMakeLists.txt
--- old/kwayland-integration-5.24.5/src/kmodifierkeyinfoprovider/CMakeLists.txt
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/kmodifierkeyinfoprovider/CMakeLists.txt
1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-add_library(kmodifierkey_wayland MODULE kmodifierkeyinfoprovider_wayland.cpp
kmodifierkeyinfoprovider_wayland.h)
-target_link_libraries(kmodifierkey_wayland PRIVATE KF5::WaylandClient
KF5::GuiAddons)
-install(TARGETS kmodifierkey_wayland DESTINATION
${KDE_INSTALL_PLUGINDIR}/kf5/kguiaddons/kmodifierkey/)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.cpp
new/kwayland-integration-5.25.0/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.cpp
---
old/kwayland-integration-5.24.5/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.cpp
2022-05-03 12:10:55.000000000 +0200
+++
new/kwayland-integration-5.25.0/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.cpp
1970-01-01 01:00:00.000000000 +0100
@@ -1,81 +0,0 @@
-/*
- SPDX-FileCopyrightText: 2019 Aleix Pol Gonzalez <aleix...@kde.org>
-
- SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR
LicenseRef-KDE-Accepted-LGPL
-*/
-
-#include "kmodifierkeyinfoprovider_wayland.h"
-#include <KWayland/Client/connection_thread.h>
-#include <KWayland/Client/registry.h>
-#include <QDebug>
-#include <QTimer>
-
-using namespace KWayland::Client;
-
-KModifierKeyInfoProviderWayland::KModifierKeyInfoProviderWayland()
-{
- auto registry = new Registry(this);
-
- auto m_waylandConnection = ConnectionThread::fromApplication(this);
- if (!m_waylandConnection) {
- qWarning() << "Failed getting Wayland connection from QPA";
- return;
- }
- registry->create(m_waylandConnection);
- registry->setup();
-
- connect(registry, &Registry::keystateAnnounced, this, [this,
registry](quint32 name, quint32 version) {
- m_keystate = registry->createKeystate(name, version, this);
- connect(m_keystate, &Keystate::stateChanged, this,
&KModifierKeyInfoProviderWayland::updateModifiers);
- m_keystate->fetchStates();
- });
-
- stateUpdated(Qt::Key_CapsLock, KModifierKeyInfoProvider::Nothing);
- stateUpdated(Qt::Key_NumLock, KModifierKeyInfoProvider::Nothing);
- stateUpdated(Qt::Key_ScrollLock, KModifierKeyInfoProvider::Nothing);
-}
-
-KModifierKeyInfoProviderWayland::~KModifierKeyInfoProviderWayland() = default;
-
-bool KModifierKeyInfoProviderWayland::setKeyLatched(Qt::Key /*key*/, bool
/*latched*/)
-{
- return false;
-}
-
-bool KModifierKeyInfoProviderWayland::setKeyLocked(Qt::Key /*key*/, bool
/*locked*/)
-{
- return false;
-}
-
-KModifierKeyInfoProvider::ModifierState toState(Keystate::State state)
-{
- switch (state) {
- case Keystate::State::Unlocked:
- return KModifierKeyInfoProvider::Nothing;
- case Keystate::State::Latched:
- return KModifierKeyInfoProvider::Latched;
- case Keystate::State::Locked:
- return KModifierKeyInfoProvider::Locked;
- }
- Q_UNREACHABLE();
- return KModifierKeyInfoProvider::Nothing;
-}
-
-Qt::Key toKey(Keystate::Key key)
-{
- switch (key) {
- case Keystate::Key::CapsLock:
- return Qt::Key_CapsLock;
- case Keystate::Key::NumLock:
- return Qt::Key_NumLock;
- case Keystate::Key::ScrollLock:
- return Qt::Key_ScrollLock;
- }
- Q_UNREACHABLE();
- return {};
-}
-
-void KModifierKeyInfoProviderWayland::updateModifiers(Keystate::Key key,
Keystate::State state)
-{
- stateUpdated(toKey(key), toState(state));
-}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.h
new/kwayland-integration-5.25.0/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.h
---
old/kwayland-integration-5.24.5/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.h
2022-05-03 12:10:55.000000000 +0200
+++
new/kwayland-integration-5.25.0/src/kmodifierkeyinfoprovider/kmodifierkeyinfoprovider_wayland.h
1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-/*
- SPDX-FileCopyrightText: 2019 Aleix Pol Gonzalez <aleix...@kde.org>
-
- SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR
LicenseRef-KDE-Accepted-LGPL
-*/
-
-#ifndef KMODIFIERKEYINFOPROVIDERWAYLAND_H
-#define KMODIFIERKEYINFOPROVIDERWAYLAND_H
-
-#include <KWayland/Client/keystate.h>
-#include <QPointer>
-#include <kmodifierkeyinfoprovider_p.h>
-
-class KModifierKeyInfoProviderWayland : public KModifierKeyInfoProvider
-{
- Q_OBJECT
- Q_PLUGIN_METADATA(IID
"org.kde.kguiaddons.KModifierKeyInfoProvider.Wayland")
-public:
- KModifierKeyInfoProviderWayland();
- ~KModifierKeyInfoProviderWayland();
-
- bool setKeyLatched(Qt::Key key, bool latched) override;
- bool setKeyLocked(Qt::Key key, bool locked) override;
-
-private:
- void updateModifiers(KWayland::Client::Keystate::Key key,
KWayland::Client::Keystate::State state);
-
- QPointer<KWayland::Client::Keystate> m_keystate;
-};
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/CMakeLists.txt
new/kwayland-integration-5.25.0/src/windowsystem/CMakeLists.txt
--- old/kwayland-integration-5.24.5/src/windowsystem/CMakeLists.txt
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/CMakeLists.txt
2022-06-09 11:10:07.000000000 +0200
@@ -1,3 +1,4 @@
+add_library(KF5WindowSystemKWaylandPlugin MODULE)
set(wayland_plugin_SRCS
plugin.cpp
waylandintegration.cpp
@@ -14,18 +15,25 @@
windowsystem.h
waylandxdgactivationv1_p.h
)
+if (QT_MAJOR_VERSION EQUAL "5")
+ ecm_add_qtwayland_client_protocol(wayland_plugin_SRCS
+ PROTOCOL
${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
+ BASENAME xdg-activation-v1
+ )
+else()
+ qt6_generate_wayland_protocol_client_sources(KF5WindowSystemKWaylandPlugin
FILES
+
${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
+ )
-ecm_add_qtwayland_client_protocol(wayland_plugin_SRCS
- PROTOCOL
${WaylandProtocols_DATADIR}/staging/xdg-activation/xdg-activation-v1.xml
- BASENAME xdg-activation-v1
-)
+endif()
ecm_qt_declare_logging_category(wayland_plugin_SRCS HEADER logging.h
IDENTIFIER KWAYLAND_KWS
CATEGORY_NAME org.kde.kf5.kwindowsystem.kwayland DEFAULT_SEVERITY Warning
DESCRIPTION "wayland integration (windowsystem)" EXPORT KWAYLAND)
+target_sources(KF5WindowSystemKWaylandPlugin PRIVATE ${wayland_plugin_SRCS})
+
pkg_check_modules(XKBCommon REQUIRED IMPORTED_TARGET xkbcommon)
-add_library(KF5WindowSystemKWaylandPlugin MODULE ${wayland_plugin_SRCS})
target_link_libraries(KF5WindowSystemKWaylandPlugin
KF5::WindowSystem
KF5::WaylandClient
@@ -33,15 +41,20 @@
Wayland::Client
Qt::WaylandClient
Qt::WaylandClientPrivate
- Qt::XkbCommonSupportPrivate
PkgConfig::XKBCommon
)
+if (QT_MAJOR_VERSION EQUAL "5")
+ target_link_libraries(KF5WindowSystemKWaylandPlugin
+ Qt::XkbCommonSupportPrivate
+ )
+endif()
+
install(
TARGETS
KF5WindowSystemKWaylandPlugin
DESTINATION
- ${KDE_INSTALL_PLUGINDIR}/kf5/kwindowsystem/
+ ${KDE_INSTALL_PLUGINDIR}/kf${QT_MAJOR_VERSION}/kwindowsystem/
)
ecm_qt_install_logging_categories(
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/plugin.h
new/kwayland-integration-5.25.0/src/windowsystem/plugin.h
--- old/kwayland-integration-5.24.5/src/windowsystem/plugin.h 2022-05-03
12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/plugin.h 2022-06-09
11:10:07.000000000 +0200
@@ -6,7 +6,7 @@
#ifndef KWINDOWSYSTEM_KWAYLAND_PLUGIN_H
#define KWINDOWSYSTEM_KWAYLAND_PLUGIN_H
-#include <KWindowSystem/private/kwindowsystemplugininterface_p.h>
+#include <private/kwindowsystemplugininterface_p.h>
class KWaylandPlugin : public KWindowSystemPluginInterface
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/waylandintegration.cpp
new/kwayland-integration-5.25.0/src/windowsystem/waylandintegration.cpp
--- old/kwayland-integration-5.24.5/src/windowsystem/waylandintegration.cpp
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/waylandintegration.cpp
2022-06-09 11:10:07.000000000 +0200
@@ -22,7 +22,7 @@
#include <KWayland/Client/slide.h>
#include <KWayland/Client/surface.h>
-#include <KWindowSystem/KWindowSystem>
+#include <KWindowSystem>
#include "waylandxdgactivationv1_p.h"
#include <QGuiApplication>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/waylandintegration.h
new/kwayland-integration-5.25.0/src/windowsystem/waylandintegration.h
--- old/kwayland-integration-5.24.5/src/windowsystem/waylandintegration.h
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/waylandintegration.h
2022-06-09 11:10:07.000000000 +0200
@@ -7,7 +7,7 @@
*/
#ifndef WAYLANDINTEGRATION_H
#define WAYLANDINTEGRATION_H
-#include <KWindowSystem/private/kwindoweffects_p.h>
+#include <private/kwindoweffects_p.h>
#include <QPointer>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/windoweffects.h
new/kwayland-integration-5.25.0/src/windowsystem/windoweffects.h
--- old/kwayland-integration-5.24.5/src/windowsystem/windoweffects.h
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/windoweffects.h
2022-06-09 11:10:07.000000000 +0200
@@ -6,10 +6,11 @@
*/
#ifndef WINDOWEFFECTS_H
#define WINDOWEFFECTS_H
-#include <KWindowSystem/private/kwindoweffects_p.h>
#include <kwindowsystem_version.h>
+#include <private/kwindoweffects_p.h>
#include <QHash>
+#include <QObject>
namespace KWayland
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/windowinfo.h
new/kwayland-integration-5.25.0/src/windowsystem/windowinfo.h
--- old/kwayland-integration-5.24.5/src/windowsystem/windowinfo.h
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/windowinfo.h
2022-06-09 11:10:07.000000000 +0200
@@ -7,8 +7,8 @@
#ifndef WINDOWINFO_H
#define WINDOWINFO_H
-#include <KWindowSystem/private/kwindowinfo_p.h>
#include <kwindowinfo.h>
+#include <private/kwindowinfo_p.h>
namespace KWayland
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/windowshadow.h
new/kwayland-integration-5.25.0/src/windowsystem/windowshadow.h
--- old/kwayland-integration-5.24.5/src/windowsystem/windowshadow.h
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/windowshadow.h
2022-06-09 11:10:07.000000000 +0200
@@ -9,7 +9,7 @@
#include <KWayland/Client/buffer.h>
#include <KWayland/Client/shadow.h>
-#include <KWindowSystem/private/kwindowshadow_p.h>
+#include <private/kwindowshadow_p.h>
class WindowShadowTile final : public KWindowShadowTilePrivate
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/windowsystem.cpp
new/kwayland-integration-5.25.0/src/windowsystem/windowsystem.cpp
--- old/kwayland-integration-5.24.5/src/windowsystem/windowsystem.cpp
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/windowsystem.cpp
2022-06-09 11:10:07.000000000 +0200
@@ -8,7 +8,7 @@
#include "waylandintegration.h"
#include "waylandxdgactivationv1_p.h"
-#include <KWindowSystem/KWindowSystem>
+#include <KWindowSystem>
#include <KWayland/Client/connection_thread.h>
#include <KWayland/Client/plasmashell.h>
@@ -59,7 +59,10 @@
wl_surface *wlSurface = surface ? static_cast<wl_surface *>(*surface) :
nullptr;
WaylandXdgActivationV1 *activation =
WaylandIntegration::self()->activation();
if (!activation) {
- Q_EMIT KWindowSystem::self()->xdgActivationTokenArrived(serial, {});
+ // Ensure that xdgActivationTokenArrived is always emitted
asynchronously
+ QTimer::singleShot(0, [serial] {
+ Q_EMIT KWindowSystem::self()->xdgActivationTokenArrived(serial,
{});
+ });
return;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.24.5/src/windowsystem/windowsystem.h
new/kwayland-integration-5.25.0/src/windowsystem/windowsystem.h
--- old/kwayland-integration-5.24.5/src/windowsystem/windowsystem.h
2022-05-03 12:10:55.000000000 +0200
+++ new/kwayland-integration-5.25.0/src/windowsystem/windowsystem.h
2022-06-09 11:10:07.000000000 +0200
@@ -6,7 +6,7 @@
#ifndef WINDOWSYSTEM_H
#define WINDOWSYSTEM_H
-#include <KWindowSystem/private/kwindowsystem_p.h>
+#include <private/kwindowsystem_p.h>
#include <QObject>
