Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kwayland6 for openSUSE:Factory checked in at 2024-06-22 13:22:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwayland6 (Old) and /work/SRC/openSUSE:Factory/.kwayland6.new.18349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland6" Sat Jun 22 13:22:03 2024 rev:6 rq:1181122 version:6.1.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwayland6/kwayland6.changes 2024-05-27 11:48:37.717900667 +0200 +++ /work/SRC/openSUSE:Factory/.kwayland6.new.18349/kwayland6.changes 2024-06-22 13:22:17.428181372 +0200 @@ -1,0 +2,29 @@ +Thu Jun 13 10:58:32 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 6.1.0: + * New bugfix release + * For more details see https://kde.org/announcements/plasma/6/6.1.0 +- Changes since 6.0.90: + * update version for new release + * Guard org_kde_plasma_window_management.get_stacking_order with proper version check +- Drop patches, now upstream: + * 0001-Guard-org_kde_plasma_window_management.get_stacking_.patch + +------------------------------------------------------------------- +Mon Jun 3 17:56:33 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de> + +- Add patch to fix crash with old kwin: + * 0001-Guard-org_kde_plasma_window_management.get_stacking_.patch + +------------------------------------------------------------------- +Sat May 25 11:18:21 UTC 2024 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 6.0.90: + * New feature release + * For more details see https://kde.org/announcements/plasma/6/6.0.90 +- Changes since 6.0.5: + * update version for new release + * client: update plasma-window-management to v17 (kde#479492) + * Remove explicit maintainer from metainfo + +------------------------------------------------------------------- Old: ---- kwayland-6.0.5.tar.xz kwayland-6.0.5.tar.xz.sig New: ---- kwayland-6.1.0.tar.xz kwayland-6.1.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland6.spec ++++++ --- /var/tmp/diff_new_pack.LkidJD/_old 2024-06-22 13:22:19.008239147 +0200 +++ /var/tmp/diff_new_pack.LkidJD/_new 2024-06-22 13:22:19.012239293 +0200 @@ -16,20 +16,20 @@ # -%define kf6_version 6.0.0 +%define kf6_version 6.2.0 %define qt6_version 6.6.0 %define rname kwayland %bcond_without released Name: kwayland6 -Version: 6.0.5 +Version: 6.1.0 Release: 0 Summary: KDE Wayland library License: LGPL-2.1-or-later URL: https://www.kde.org -Source: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz +Source: %{rname}-%{version}.tar.xz %if %{with released} -Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{version}.tar.xz.sig +Source1: %{rname}-%{version}.tar.xz.sig Source2: plasma.keyring %endif BuildRequires: doxygen ++++++ kwayland-6.0.5.tar.xz -> kwayland-6.1.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-6.0.5/CMakeLists.txt new/kwayland-6.1.0/CMakeLists.txt --- old/kwayland-6.0.5/CMakeLists.txt 2024-05-21 18:48:34.000000000 +0200 +++ new/kwayland-6.1.0/CMakeLists.txt 2024-06-13 12:35:26.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(PROJECT_VERSION "6.0.5") +set(PROJECT_VERSION "6.1.0") project(kwayland VERSION ${PROJECT_VERSION}) set(QT_MIN_VERSION "6.6.0") -set(KF6_MIN_VERSION "6.0.0") +set(KF6_MIN_VERSION "6.2.0") set(CMAKE_CXX_STANDARD 20) set(CMAKE_CXX_STANDARD_REQUIRED ON) @@ -128,6 +128,7 @@ INSTALL) endif() -feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +include(ECMFeatureSummary) +ecm_feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) kde_configure_git_pre_commit_hook(CHECKS CLANG_FORMAT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-6.0.5/metainfo.yaml new/kwayland-6.1.0/metainfo.yaml --- old/kwayland-6.0.5/metainfo.yaml 2024-05-21 18:48:34.000000000 +0200 +++ new/kwayland-6.1.0/metainfo.yaml 2024-06-13 12:35:26.000000000 +0200 @@ -1,7 +1,6 @@ fancyname: KWayland description: Qt-style API to interact with the wayland-client API irc: plasma -maintainer: graesslin platforms: - name: Linux - name: FreeBSD diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-6.0.5/src/client/plasmawindowmanagement.cpp new/kwayland-6.1.0/src/client/plasmawindowmanagement.cpp --- old/kwayland-6.0.5/src/client/plasmawindowmanagement.cpp 2024-05-21 18:48:34.000000000 +0200 +++ new/kwayland-6.1.0/src/client/plasmawindowmanagement.cpp 2024-06-13 12:35:26.000000000 +0200 @@ -24,8 +24,9 @@ { namespace Client { -class Q_DECL_HIDDEN PlasmaWindowManagement::Private +class Q_DECL_HIDDEN PlasmaWindowManagement::Private : public QObject { + Q_OBJECT public: Private(PlasmaWindowManagement *q); WaylandPointer<org_kde_plasma_window_management, org_kde_plasma_window_management_destroy> wm; @@ -44,12 +45,17 @@ static void windowWithUuidCallback(void *data, org_kde_plasma_window_management *org_kde_plasma_window_management, uint32_t id, const char *uuid); static void stackingOrderCallback(void *data, org_kde_plasma_window_management *org_kde_plasma_window_management, wl_array *ids); static void stackingOrderUuidsCallback(void *data, org_kde_plasma_window_management *org_kde_plasma_window_management, const char *uuids); + static void stackingOrder2Callback(void *data, org_kde_plasma_window_management *interface); void setShowDesktop(bool set); void windowCreated(org_kde_plasma_window *id, quint32 internalId, const char *uuid); void setStackingOrder(const QList<quint32> &ids); void setStackingOrder(const QList<QByteArray> &uuids); + static void stackingOrderWindow(void *data, struct org_kde_plasma_stacking_order *org_kde_plasma_stacking_order, const char *uuid); + static void stackingOrderDone(void *data, struct org_kde_plasma_stacking_order *org_kde_plasma_stacking_order); + static struct org_kde_plasma_window_management_listener s_listener; + static const org_kde_plasma_stacking_order_listener s_stackingOrderListener; PlasmaWindowManagement *q; }; @@ -145,6 +151,11 @@ static struct org_kde_plasma_window_listener s_listener; }; +struct StackingOrderData { + QPointer<PlasmaWindowManagement::Private> wm; + QList<QByteArray> list; +}; + PlasmaWindowManagement::Private::Private(PlasmaWindowManagement *q) : q(q) { @@ -156,6 +167,7 @@ stackingOrderCallback, stackingOrderUuidsCallback, windowWithUuidCallback, + stackingOrder2Callback, }; void PlasmaWindowManagement::Private::setup(org_kde_plasma_window_management *windowManagement) @@ -164,6 +176,16 @@ Q_ASSERT(windowManagement); wm.setup(windowManagement); org_kde_plasma_window_management_add_listener(windowManagement, &s_listener, this); + + if (org_kde_plasma_window_management_get_version(windowManagement) >= ORG_KDE_PLASMA_WINDOW_MANAGEMENT_GET_STACKING_ORDER_SINCE_VERSION) { + auto object = org_kde_plasma_window_management_get_stacking_order(wm); + org_kde_plasma_stacking_order_add_listener(object, + &s_stackingOrderListener, + new StackingOrderData{ + .wm = this, + .list = {}, + }); + } } void PlasmaWindowManagement::Private::showDesktopCallback(void *data, org_kde_plasma_window_management *org_kde_plasma_window_management, uint32_t state) @@ -285,6 +307,41 @@ wm->setStackingOrder(QByteArray(uuids).split(';').toVector()); } +void PlasmaWindowManagement::Private::stackingOrderWindow(void *data, org_kde_plasma_stacking_order *org_kde_plasma_stacking_order, const char *uuid) +{ + Q_UNUSED(org_kde_plasma_stacking_order); + auto order = static_cast<StackingOrderData *>(data); + order->list.push_back(uuid); +} + +void PlasmaWindowManagement::Private::stackingOrderDone(void *data, org_kde_plasma_stacking_order *org_kde_plasma_stacking_order) +{ + auto order = static_cast<StackingOrderData *>(data); + if (order->wm) { + order->wm->setStackingOrder(order->list); + } + delete order; + org_kde_plasma_stacking_order_destroy(org_kde_plasma_stacking_order); +} + +const org_kde_plasma_stacking_order_listener PlasmaWindowManagement::Private::s_stackingOrderListener = { + .window = stackingOrderWindow, + .done = stackingOrderDone, +}; + +void PlasmaWindowManagement::Private::stackingOrder2Callback(void *data, org_kde_plasma_window_management *interface) +{ + auto wm = reinterpret_cast<PlasmaWindowManagement::Private *>(data); + Q_ASSERT(wm->wm == interface); + auto object = org_kde_plasma_window_management_get_stacking_order(wm->wm); + org_kde_plasma_stacking_order_add_listener(object, + &s_stackingOrderListener, + new StackingOrderData{ + .wm = wm, + .list = {}, + }); +} + void PlasmaWindowManagement::Private::setStackingOrder(const QList<QByteArray> &uuids) { if (stackingOrderUuids == uuids) { @@ -1318,4 +1375,4 @@ } } -#include "moc_plasmawindowmanagement.cpp" +#include "plasmawindowmanagement.moc" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-6.0.5/src/client/registry.cpp new/kwayland-6.1.0/src/client/registry.cpp --- old/kwayland-6.0.5/src/client/registry.cpp 2024-05-21 18:48:34.000000000 +0200 +++ new/kwayland-6.1.0/src/client/registry.cpp 2024-06-13 12:35:26.000000000 +0200 @@ -155,7 +155,7 @@ &Registry::plasmaVirtualDesktopManagementRemoved }}, {Registry::Interface::PlasmaWindowManagement, { - 16, + 17, QByteArrayLiteral("org_kde_plasma_window_management"), &org_kde_plasma_window_management_interface, &Registry::plasmaWindowManagementAnnounced,
