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 2021-06-07 22:42:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kwayland-integration (Old)
and /work/SRC/openSUSE:Factory/.kwayland-integration.new.32437 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland-integration"
Mon Jun 7 22:42:21 2021 rev:102 rq:897482 version:5.22.0
Changes:
--------
---
/work/SRC/openSUSE:Factory/kwayland-integration/kwayland-integration.changes
2021-05-06 22:52:24.374804194 +0200
+++
/work/SRC/openSUSE:Factory/.kwayland-integration.new.32437/kwayland-integration.changes
2021-06-07 22:42:34.260390952 +0200
@@ -1,0 +2,25 @@
+Thu Jun 3 13:06:14 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 5.22.0
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.22.0
+- No code changes since 5.21.90
+
+-------------------------------------------------------------------
+Thu May 13 18:15:34 UTC 2021 - Fabian Vogt <fab...@ritter-vogt.de>
+
+- Update to 5.21.90
+ * New feature release
+ * For more details please see:
+ * https://kde.org/announcements/plasma/5/5.21.90
+- Changes since 5.21.5:
+ * Migrate to KDECompilerSettings
+ * Fix compile against kf5.82
+ * Drop functions which rely on PlasmaWindow::internalId() (kde#436498)
+ * Fix compilation with no deprecated build of KWindowSystem
+ * Raise minimum CMake version to 3.16
+ * Use versionless Qt cmake target
+ * Autogenerate categories file
+
+-------------------------------------------------------------------
Old:
----
kwayland-integration-5.21.5.tar.xz
kwayland-integration-5.21.5.tar.xz.sig
New:
----
kwayland-integration-5.22.0.tar.xz
kwayland-integration-5.22.0.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kwayland-integration.spec ++++++
--- /var/tmp/diff_new_pack.aFDrfd/_old 2021-06-07 22:42:34.740391763 +0200
+++ /var/tmp/diff_new_pack.aFDrfd/_new 2021-06-07 22:42:34.744391769 +0200
@@ -18,7 +18,7 @@
%bcond_without lang
Name: kwayland-integration
-Version: 5.21.5
+Version: 5.22.0
Release: 0
# Full Plasma 5 version (e.g. 5.8.95)
%{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}}
@@ -28,12 +28,12 @@
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 lang}
-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 >= 2.8.12
+BuildRequires: cmake >= 3.16
BuildRequires: extra-cmake-modules >= 0.0.11
BuildRequires: kf5-filesystem
BuildRequires: cmake(KF5GuiAddons) >= 5.60.0
++++++ kwayland-integration-5.21.5.tar.xz -> kwayland-integration-5.22.0.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.21.5/.gitignore
new/kwayland-integration-5.22.0/.gitignore
--- old/kwayland-integration-5.21.5/.gitignore 2021-05-04 14:15:18.000000000
+0200
+++ new/kwayland-integration-5.22.0/.gitignore 2021-06-03 16:06:29.000000000
+0200
@@ -21,3 +21,8 @@
*.unc-backup*
.clang-format
/build*/
+/compile_commands.json
+.clangd
+.idea
+/cmake-build*
+.cache
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.21.5/CMakeLists.txt
new/kwayland-integration-5.22.0/CMakeLists.txt
--- old/kwayland-integration-5.21.5/CMakeLists.txt 2021-05-04
14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/CMakeLists.txt 2021-06-03
16:06:29.000000000 +0200
@@ -1,10 +1,10 @@
project(kwayland-integration)
-set(PROJECT_VERSION "5.21.5")
+set(PROJECT_VERSION "5.22.0")
set(PROJECT_VERSION_MAJOR 5)
-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.16)
set(QT_MIN_VERSION "5.15.0")
-set(KF5_MIN_VERSION "5.78")
+set(KF5_MIN_VERSION "5.82")
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -24,7 +24,7 @@
include(KDEInstallDirs)
include(KDECMakeSettings)
-include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
+include(KDECompilerSettings NO_POLICY_SCOPE)
include(ECMQtDeclareLoggingCategory)
include(KDEClangFormat)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/autotests/idletime/CMakeLists.txt
new/kwayland-integration-5.22.0/autotests/idletime/CMakeLists.txt
--- old/kwayland-integration-5.21.5/autotests/idletime/CMakeLists.txt
2021-05-04 14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/autotests/idletime/CMakeLists.txt
2021-06-03 16:06:29.000000000 +0200
@@ -1,4 +1,4 @@
add_executable(idleTest idle_test.cpp)
-target_link_libraries(idleTest Qt5::Gui Qt5::Test KF5::IdleTime
KF5::WaylandClient)
+target_link_libraries(idleTest Qt::Gui Qt::Test KF5::IdleTime
KF5::WaylandClient)
kwaylandtest(idleTest)
ecm_mark_as_test(idleTest)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/src/idletime/CMakeLists.txt
new/kwayland-integration-5.22.0/src/idletime/CMakeLists.txt
--- old/kwayland-integration-5.21.5/src/idletime/CMakeLists.txt 2021-05-04
14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/idletime/CMakeLists.txt 2021-06-03
16:06:29.000000000 +0200
@@ -12,5 +12,5 @@
TARGETS
KF5IdleTimeKWaylandPlugin
DESTINATION
- ${PLUGIN_INSTALL_DIR}/kf5/org.kde.kidletime.platforms/
+ ${KDE_INSTALL_PLUGINDIR}/kf5/org.kde.kidletime.platforms/
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kwayland-integration-5.21.5/src/idletime/poller.cpp
new/kwayland-integration-5.22.0/src/idletime/poller.cpp
--- old/kwayland-integration-5.21.5/src/idletime/poller.cpp 2021-05-04
14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/idletime/poller.cpp 2021-06-03
16:06:29.000000000 +0200
@@ -136,7 +136,7 @@
m_timeouts.insert(nextTimeout, timeout);
connect(timeout, &KWayland::Client::IdleTimeout::idle, this,
[this, nextTimeout] {
- emit timeoutReached(nextTimeout);
+ Q_EMIT timeoutReached(nextTimeout);
}
);
connect(timeout, &KWayland::Client::IdleTimeout::resumeFromIdle, this,
&Poller::resumingFromIdle);
@@ -170,7 +170,7 @@
connect(m_catchResumeTimeout,
&KWayland::Client::IdleTimeout::resumeFromIdle, this,
[this] {
stopCatchingIdleEvents();
- emit resumingFromIdle();
+ Q_EMIT resumingFromIdle();
}
);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/src/kmodifierkeyinfoprovider/CMakeLists.txt
new/kwayland-integration-5.22.0/src/kmodifierkeyinfoprovider/CMakeLists.txt
--- old/kwayland-integration-5.21.5/src/kmodifierkeyinfoprovider/CMakeLists.txt
2021-05-04 14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/kmodifierkeyinfoprovider/CMakeLists.txt
2021-06-03 16:06:29.000000000 +0200
@@ -1,3 +1,3 @@
add_library(kmodifierkey_wayland MODULE kmodifierkeyinfoprovider_wayland.cpp)
target_link_libraries(kmodifierkey_wayland PRIVATE KF5::WaylandClient
KF5::GuiAddons)
-install(TARGETS kmodifierkey_wayland DESTINATION
${PLUGIN_INSTALL_DIR}/kf5/kguiaddons/kmodifierkey/)
+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.21.5/src/windowsystem/CMakeLists.txt
new/kwayland-integration-5.22.0/src/windowsystem/CMakeLists.txt
--- old/kwayland-integration-5.21.5/src/windowsystem/CMakeLists.txt
2021-05-04 14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/windowsystem/CMakeLists.txt
2021-06-03 16:06:29.000000000 +0200
@@ -7,22 +7,28 @@
windowshadow.cpp
windowsystem.cpp
)
-ecm_qt_declare_logging_category(wayland_plugin_SRCS HEADER logging.h
IDENTIFIER KWAYLAND_KWS CATEGORY_NAME org.kde.kf5.kwindowsystem.kwayland
DEFAULT_SEVERITY Warning)
+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)
add_library(KF5WindowSystemKWaylandPlugin MODULE ${wayland_plugin_SRCS})
target_link_libraries(KF5WindowSystemKWaylandPlugin
KF5::WindowSystem
KF5::WaylandClient
- Qt5::Widgets
+ Qt::Widgets
)
install(
TARGETS
KF5WindowSystemKWaylandPlugin
DESTINATION
- ${PLUGIN_INSTALL_DIR}/kf5/kwindowsystem/
+ ${KDE_INSTALL_PLUGINDIR}/kf5/kwindowsystem/
)
-install(FILES kwindowsystem.kwayland.categories DESTINATION
${KDE_INSTALL_LOGGINGCATEGORIESDIR})
+ecm_qt_install_logging_categories(
+ EXPORT KWAYLAND
+ FILE kwindowsystem.kwayland.categories
+ DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}
+ )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/src/windowsystem/kwindowsystem.kwayland.categories
new/kwayland-integration-5.22.0/src/windowsystem/kwindowsystem.kwayland.categories
---
old/kwayland-integration-5.21.5/src/windowsystem/kwindowsystem.kwayland.categories
2021-05-04 14:15:18.000000000 +0200
+++
new/kwayland-integration-5.22.0/src/windowsystem/kwindowsystem.kwayland.categories
1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-org.kde.kf5.kwindowsystem.kwayland wayland integration (windowsystem)
DEFAULT_SEVERITY [WARNING]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/src/windowsystem/waylandintegration.cpp
new/kwayland-integration-5.22.0/src/windowsystem/waylandintegration.cpp
--- old/kwayland-integration-5.21.5/src/windowsystem/waylandintegration.cpp
2021-05-04 14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/windowsystem/waylandintegration.cpp
2021-06-03 16:06:29.000000000 +0200
@@ -172,27 +172,6 @@
}
m_wm = m_registry->createPlasmaWindowManagement(wmInterface.name,
wmInterface.version, qApp);
- connect(m_wm, &PlasmaWindowManagement::windowCreated, this,
- [this] (PlasmaWindow *w) {
- emit KWindowSystem::self()->windowAdded(w->internalId());
- emit KWindowSystem::self()->stackingOrderChanged();
- connect(w, &PlasmaWindow::unmapped, this,
- [w] {
- emit
KWindowSystem::self()->windowRemoved(w->internalId());
- emit KWindowSystem::self()->stackingOrderChanged();
- }
- );
- }
- );
- connect(m_wm, &PlasmaWindowManagement::activeWindowChanged, this,
- [this] {
- if (PlasmaWindow *w = m_wm->activeWindow()) {
- emit
KWindowSystem::self()->activeWindowChanged(w->internalId());
- } else {
- emit KWindowSystem::self()->activeWindowChanged(0);
- }
- }
- );
connect(m_wm, &PlasmaWindowManagement::showingDesktopChanged,
KWindowSystem::self(), &KWindowSystem::showingDesktopChanged);
qCDebug(KWAYLAND_KWS) << "Plasma Window Management interface bound";
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/src/windowsystem/windoweffects.cpp
new/kwayland-integration-5.22.0/src/windowsystem/windoweffects.cpp
--- old/kwayland-integration-5.21.5/src/windowsystem/windoweffects.cpp
2021-05-04 14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/windowsystem/windoweffects.cpp
2021-06-03 16:06:29.000000000 +0200
@@ -150,31 +150,38 @@
}
}
-
+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 81)
QList<QSize> WindowEffects::windowSizes(const QList<WId> &ids)
{
Q_UNUSED(ids)
QList<QSize> sizes;
return sizes;
}
+#endif
+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 82)
void WindowEffects::presentWindows(WId controller, const QList<WId> &ids)
{
Q_UNUSED(controller)
Q_UNUSED(ids)
}
+#endif
+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 82)
void WindowEffects::presentWindows(WId controller, int desktop)
{
Q_UNUSED(controller)
Q_UNUSED(desktop)
}
+#endif
+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 82)
void WindowEffects::highlightWindows(WId controller, const QList<WId> &ids)
{
Q_UNUSED(controller)
Q_UNUSED(ids)
}
+#endif
void WindowEffects::enableBlurBehind(WId winId, bool enable, const QRegion
®ion)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/src/windowsystem/windoweffects.h
new/kwayland-integration-5.22.0/src/windowsystem/windoweffects.h
--- old/kwayland-integration-5.21.5/src/windowsystem/windoweffects.h
2021-05-04 14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/windowsystem/windoweffects.h
2021-06-03 16:06:29.000000000 +0200
@@ -37,10 +37,14 @@
bool isEffectAvailable(KWindowEffects::Effect effect) override;
void slideWindow(WId id, KWindowEffects::SlideFromLocation location, int
offset) override;
+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 81)
QList<QSize> windowSizes(const QList<WId> &ids) override;
+#endif
+#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 82)
void presentWindows(WId controller, const QList<WId> &ids) override;
void presentWindows(WId controller, int desktop = NET::OnAllDesktops)
override;
void highlightWindows(WId controller, const QList<WId> &ids) override;
+#endif
void enableBlurBehind(WId winId, bool enable = true, const QRegion ®ion
= QRegion()) override;
void enableBlurBehind(QWindow *window, bool enable, const QRegion ®ion);
void enableBackgroundContrast(WId winId, bool enable = true, qreal
contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion
= QRegion()) override;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/src/windowsystem/windowsystem.cpp
new/kwayland-integration-5.22.0/src/windowsystem/windowsystem.cpp
--- old/kwayland-integration-5.21.5/src/windowsystem/windowsystem.cpp
2021-05-04 14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/windowsystem/windowsystem.cpp
2021-06-03 16:06:29.000000000 +0200
@@ -27,54 +27,23 @@
{
}
-KWayland::Client::PlasmaWindow *WindowSystem::window(WId wid) const
-{
- if (!WaylandIntegration::self()->plasmaWindowManagement()) {
- return nullptr;
- }
-
- const auto &windows =
WaylandIntegration::self()->plasmaWindowManagement()->windows();
- auto it = std::find_if(windows.begin(), windows.end(), [wid] (PlasmaWindow
*w) { return w->internalId() == wid; } );
- if (it != windows.end()) {
- return *it;
- }
- return nullptr;
-}
-
void WindowSystem::activateWindow(WId win, long int time)
{
+ Q_UNUSED(win)
Q_UNUSED(time)
- if (PlasmaWindow *w = window(win)) {
- w->requestActivate();
- }
+ qCDebug(KWAYLAND_KWS) << "This plugin does not support force activating
windows";
}
void WindowSystem::forceActiveWindow(WId win, long int time)
{
+ Q_UNUSED(win)
Q_UNUSED(time)
- if (PlasmaWindow *w = window(win)) {
- w->requestActivate();
- } else {
- Surface *s = Surface::fromQtWinId(win);
- if (!s) {
- return;
- }
- auto plasmaShellSurface = PlasmaShellSurface::get(s);
- if (!plasmaShellSurface) {
- return;
- }
- if (plasmaShellSurface->role() == PlasmaShellSurface::Role::Panel) {
- plasmaShellSurface->setPanelTakesFocus(true);
- }
- }
+ qCDebug(KWAYLAND_KWS) << "This plugin does not support force activating
windows";
}
WId WindowSystem::activeWindow()
{
- KWayland::Client::PlasmaWindowManagement *wm =
WaylandIntegration::self()->plasmaWindowManagement();
- if (wm && wm->activeWindow()) {
- return wm->activeWindow()->internalId();
- }
+ qCDebug(KWAYLAND_KWS) << "This plugin does not support virtual desktops";
return 0;
}
@@ -150,33 +119,12 @@
QPixmap WindowSystem::icon(WId win, int width, int height, bool scale, int
flags)
{
+ Q_UNUSED(win)
+ Q_UNUSED(width)
+ Q_UNUSED(height)
+ Q_UNUSED(scale)
Q_UNUSED(flags)
-
- // Since width can be any arbitrary size, but the icons cannot,
- // take the nearest value for best results (ignoring 22 pixel
- // icons as they don't exist for apps):
- int iconWidth;
- if (width < 24) {
- iconWidth = 16;
- } else if (width < 40) {
- iconWidth = 32;
- } else if (width < 56) {
- iconWidth = 48;
- } else if (width < 96) {
- iconWidth = 64;
- } else if (width < 192) {
- iconWidth = 128;
- } else {
- iconWidth = 256;
- }
-
- if (PlasmaWindow *w = window(win)) {
- QPixmap pixmap = w->icon().pixmap(iconWidth, iconWidth);
- if (scale) {
- return pixmap.scaled(width, height, Qt::IgnoreAspectRatio,
Qt::SmoothTransformation);
- }
- return pixmap;
- }
+ qCDebug(KWAYLAND_KWS) << "This plugin does not support getting window
icons";
return QPixmap();
}
@@ -194,20 +142,14 @@
void WindowSystem::minimizeWindow(WId win)
{
- if (PlasmaWindow *w = window(win)) {
- if (!w->isMinimized()) {
- w->requestToggleMinimized();
- }
- }
+ Q_UNUSED(win)
+ qCDebug(KWAYLAND_KWS) << "This plugin does not support minimizing windows";
}
void WindowSystem::unminimizeWindow(WId win)
{
- if (PlasmaWindow *w = window(win)) {
- if (w->isMinimized()) {
- w->requestToggleMinimized();
- }
- }
+ Q_UNUSED(win)
+ qCDebug(KWAYLAND_KWS) << "This plugin does not support unminimizing
windows";
}
int WindowSystem::numberOfDesktops()
@@ -302,9 +244,9 @@
void WindowSystem::setOnDesktop(WId win, int desktop)
{
- if (PlasmaWindow *w = window(win)) {
- w->requestVirtualDesktop(desktop - 1);
- }
+ Q_UNUSED(win)
+ Q_UNUSED(desktop)
+ qCDebug(KWAYLAND_KWS) << "This plugin does not support setting window on a
specific desktop";
}
void WindowSystem::setShowingDesktop(bool showing)
@@ -495,16 +437,8 @@
QList< WId > WindowSystem::stackingOrder()
{
- if (!WaylandIntegration::self()->plasmaWindowManagement()) {
- return QList<WId>();
- }
-
- const auto &windows =
WaylandIntegration::self()->plasmaWindowManagement()->windows();
- QList<WId> ret;
- for (auto w : windows) {
- ret << w->internalId();
- }
- return ret;
+ qCDebug(KWAYLAND_KWS) << "This plugin does not support getting windows";
+ return QList<WId>();
}
#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kwayland-integration-5.21.5/src/windowsystem/windowsystem.h
new/kwayland-integration-5.22.0/src/windowsystem/windowsystem.h
--- old/kwayland-integration-5.21.5/src/windowsystem/windowsystem.h
2021-05-04 14:15:18.000000000 +0200
+++ new/kwayland-integration-5.22.0/src/windowsystem/windowsystem.h
2021-06-03 16:06:29.000000000 +0200
@@ -14,8 +14,6 @@
{
namespace Client
{
-class PlasmaWindow;
-class PlasmaWindowManagement;
class PlasmaShell;
}
}
@@ -76,8 +74,6 @@
void connectNotify(const QMetaMethod &signal) override;
private:
- KWayland::Client::PlasmaWindow *window(WId window) const;
-
KWayland::Client::PlasmaShell *m_waylandPlasmaShell = nullptr;
};
