Hello community, here is the log from the commit of package kwayland for openSUSE:Factory checked in at 2019-10-14 13:39:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwayland (Old) and /work/SRC/openSUSE:Factory/.kwayland.new.2352 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland" Mon Oct 14 13:39:16 2019 rev:67 rq:738060 version:5.63.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwayland/kwayland.changes 2019-09-23 12:26:33.605716956 +0200 +++ /work/SRC/openSUSE:Factory/.kwayland.new.2352/kwayland.changes 2019-10-14 13:39:20.165736174 +0200 @@ -1,0 +2,14 @@ +Sun Oct 6 13:26:59 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.63.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.63.0.php +- Changes since 5.62.0: + * [KWayland] Port away from deprecated API in Qt 5.14 + * Sort files alphabetically in cmake list + * Improve documentation + * Use const_iterator + * Remove capture of this in lambda + +------------------------------------------------------------------- Old: ---- kwayland-5.62.0.tar.xz kwayland-5.62.0.tar.xz.sig New: ---- kwayland-5.63.0.tar.xz kwayland-5.63.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland.spec ++++++ --- /var/tmp/diff_new_pack.Nb5jHH/_old 2019-10-14 13:39:20.961734099 +0200 +++ /var/tmp/diff_new_pack.Nb5jHH/_new 2019-10-14 13:39:20.965734088 +0200 @@ -16,7 +16,7 @@ # -%define _tar_path 5.62 +%define _tar_path 5.63 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -24,7 +24,7 @@ # Only needed for the package signature condition %bcond_without lang Name: kwayland -Version: 5.62.0 +Version: 5.63.0 Release: 0 Summary: KDE Wayland library License: LGPL-2.1-or-later ++++++ kwayland-5.62.0.tar.xz -> kwayland-5.63.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/CMakeLists.txt new/kwayland-5.63.0/CMakeLists.txt --- old/kwayland-5.62.0/CMakeLists.txt 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/CMakeLists.txt 2019-10-06 11:37:54.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.62.0") # handled by release scripts +set(KF5_VERSION "5.63.0") # handled by release scripts project(KWayland VERSION ${KF5_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.62.0 NO_MODULE) +find_package(ECM 5.63.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/Modules) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/autotests/client/test_wayland_surface.cpp new/kwayland-5.63.0/autotests/client/test_wayland_surface.cpp --- old/kwayland-5.62.0/autotests/client/test_wayland_surface.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/autotests/client/test_wayland_surface.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -393,9 +393,13 @@ QImage blue(24, 24, QImage::Format_ARGB32_Premultiplied); blue.fill(QColor(0, 0, 255, 128)); - wl_buffer *blackBuffer = *(m_shm->createBuffer(black).data()); - auto redBuffer = m_shm->createBuffer(red); - auto blueBuffer = m_shm->createBuffer(blue).toStrongRef(); + QSharedPointer<KWayland::Client::Buffer> blackBufferPtr = m_shm->createBuffer(black).toStrongRef(); + QVERIFY(blackBufferPtr); + wl_buffer *blackBuffer = *(blackBufferPtr.data()); + QSharedPointer<KWayland::Client::Buffer> redBuffer = m_shm->createBuffer(red).toStrongRef(); + QVERIFY(redBuffer); + QSharedPointer<KWayland::Client::Buffer> blueBuffer = m_shm->createBuffer(blue).toStrongRef(); + QVERIFY(blueBuffer); QCOMPARE(blueBuffer->format(), KWayland::Client::Buffer::Format::ARGB32); QCOMPARE(blueBuffer->size(), blue.size()); @@ -776,7 +780,8 @@ //attach a buffer of 100x100, our scale is 4, so this should be a size of 25x25 QImage red(100, 100, QImage::Format_ARGB32_Premultiplied); red.fill(QColor(255, 0, 0, 128)); - auto redBuffer = m_shm->createBuffer(red); + QSharedPointer<Buffer> redBuffer = m_shm->createBuffer(red).toStrongRef(); + QVERIFY(redBuffer); s->attachBuffer(redBuffer.data()); s->damage(QRect(0,0, 25,25)); s->commit(Surface::CommitFlag::None); @@ -800,7 +805,8 @@ //set scale and size in one commit, buffer is 50x50 at scale 2 so size should be 25x25 QImage blue(50, 50, QImage::Format_ARGB32_Premultiplied); red.fill(QColor(255, 0, 0, 128)); - auto blueBuffer = m_shm->createBuffer(blue); + QSharedPointer<Buffer> blueBuffer = m_shm->createBuffer(blue).toStrongRef(); + QVERIFY(blueBuffer); s->attachBuffer(blueBuffer.data()); s->setScale(2); s->commit(Surface::CommitFlag::None); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/CMakeLists.txt new/kwayland-5.63.0/src/CMakeLists.txt --- old/kwayland-5.62.0/src/CMakeLists.txt 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/CMakeLists.txt 2019-10-06 11:37:54.000000000 +0200 @@ -33,6 +33,9 @@ MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" LINK_QCHS Qt5Gui_QCH + INCLUDE_DIRS + ${KWaylandClient_APIDOX_BUILD_INCLUDE_DIRS} + ${KWaylandServer_APIDOX_BUILD_INCLUDE_DIRS} BLANK_MACROS KWAYLANDCLIENT_EXPORT KWAYLANDCLIENT_DEPRECATED diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/client/CMakeLists.txt new/kwayland-5.63.0/src/client/CMakeLists.txt --- old/kwayland-5.62.0/src/client/CMakeLists.txt 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/client/CMakeLists.txt 2019-10-06 11:37:54.000000000 +0200 @@ -314,6 +314,7 @@ # make available to ecm_add_qch in parent folder set(KWaylandClient_APIDOX_SRCS ${CLIENT_LIB_HEADERS} PARENT_SCOPE) +set(KWaylandClient_APIDOX_BUILD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME KWaylandClient LIB_NAME KF5WaylandClient DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/client/datadevice.h new/kwayland-5.63.0/src/client/datadevice.h --- old/kwayland-5.62.0/src/client/datadevice.h 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/client/datadevice.h 2019-10-06 11:37:54.000000000 +0200 @@ -36,7 +36,7 @@ class Surface; /** - * @short Wrapper for the wl_data_device interface. + * @short DataDevice allows clients to share data by copy-and-paste and drag-and-drop. * * This class is a convenient wrapper for the wl_data_device interface. * To create a DataDevice call DataDeviceManager::getDataDevice. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/client/dpms.h new/kwayland-5.63.0/src/client/dpms.h --- old/kwayland-5.62.0/src/client/dpms.h 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/client/dpms.h 2019-10-06 11:37:54.000000000 +0200 @@ -37,9 +37,9 @@ class Output; /** - * @short Wrapper for the org_kde_kwin_dpms_manager interface. + * @short This class is a factory for Dpms instances. * - * This class provides a convenient wrapper for the org_kde_kwin_dpms_manager interface. + * It is a convenience wrapper for the org_kde_kwin_dpms_manager interface. * * To use this class one needs to interact with the Registry. There are two * possible ways to create the DpmsManager interface: @@ -57,7 +57,7 @@ * The DpmsManager can be used as a drop-in replacement for any org_kde_kwin_dpms_manager * pointer as it provides matching cast operators. * - * @see Registry + * @see Registry, Dpms * @since 5.5 **/ class KWAYLANDCLIENT_EXPORT DpmsManager : public QObject @@ -134,8 +134,9 @@ }; /** - * @short Wrapper for the org_kde_kwin_dpms interface. + * @short Power management for monitors. * + * Display Power Management Signaling allows power management for monitors. * This class is a convenient wrapper for the org_kde_kwin_dpms interface. * To create a Dpms call DpmsManager::getDpms. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/client/plasmawindowmanagement.cpp new/kwayland-5.63.0/src/client/plasmawindowmanagement.cpp --- old/kwayland-5.62.0/src/client/plasmawindowmanagement.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/client/plasmawindowmanagement.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -361,12 +361,12 @@ Q_UNUSED(window) Private *p = cast(data); const auto windows = p->wm->windows(); - auto it = std::find_if(windows.begin(), windows.end(), + auto it = std::find_if(windows.constBegin(), windows.constEnd(), [parent] (const PlasmaWindow *w) { return *w == parent; } ); - p->setParentWindow(it != windows.end() ? *it : nullptr); + p->setParentWindow(it != windows.constEnd() ? *it : nullptr); } void PlasmaWindow::Private::windowGeometryCallback(void *data, org_kde_plasma_window *window, int32_t x, int32_t y, uint32_t width, uint32_t height) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/client/region.cpp new/kwayland-5.63.0/src/client/region.cpp --- old/kwayland-5.62.0/src/client/region.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/client/region.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -58,7 +58,7 @@ void Region::Private::installRegion(const QRegion ®ion) { - for (const auto &rect : region.rects()) { + for (const QRect &rect : region) { installRegion(rect); } } @@ -73,7 +73,7 @@ void Region::Private::uninstallRegion(const QRegion ®ion) { - for (const auto &rect : region.rects()) { + for (const QRect &rect : region) { uninstallRegion(rect); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/client/registry.cpp new/kwayland-5.63.0/src/client/registry.cpp --- old/kwayland-5.62.0/src/client/registry.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/client/registry.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -556,7 +556,7 @@ namespace { static Registry::Interface nameToInterface(const char *interface) { - for (auto it = s_interfaces.begin(); it != s_interfaces.end(); ++it) { + for (auto it = s_interfaces.constBegin(); it != s_interfaces.constEnd(); ++it) { if (qstrcmp(interface, it.value().name) == 0) { return it.key(); } @@ -601,12 +601,12 @@ bool Registry::Private::hasInterface(Registry::Interface interface) const { - auto it = std::find_if(m_interfaces.begin(), m_interfaces.end(), + auto it = std::find_if(m_interfaces.constBegin(), m_interfaces.constEnd(), [interface](const InterfaceData &data) { return data.interface == interface; } ); - return it != m_interfaces.end(); + return it != m_interfaces.constEnd(); } QVector<Registry::AnnouncedInterface> Registry::Private::interfaces(Interface interface) const @@ -873,10 +873,10 @@ template <typename T> T *Registry::Private::bind(Registry::Interface interface, uint32_t name, uint32_t version) const { - auto it = std::find_if(m_interfaces.begin(), m_interfaces.end(), [=](const InterfaceData &data) { + auto it = std::find_if(m_interfaces.constBegin(), m_interfaces.constEnd(), [=](const InterfaceData &data) { return data.interface == interface && data.name == name && data.version >= version; }); - if (it == m_interfaces.end()) { + if (it == m_interfaces.constEnd()) { qCDebug(KWAYLAND_CLIENT) << "Don't have interface " << int(interface) << "with name " << name << "and minimum version" << version; return nullptr; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/client/surface.cpp new/kwayland-5.63.0/src/client/surface.cpp --- old/kwayland-5.62.0/src/client/surface.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/client/surface.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -228,8 +228,8 @@ void Surface::damage(const QRegion ®ion) { - for (const QRect &r : region.rects()) { - damage(r); + for (const QRect &rect : region) { + damage(rect); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/server/CMakeLists.txt new/kwayland-5.63.0/src/server/CMakeLists.txt --- old/kwayland-5.62.0/src/server/CMakeLists.txt 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/server/CMakeLists.txt 2019-10-06 11:37:54.000000000 +0200 @@ -1,33 +1,36 @@ set(SERVER_LIB_SRCS + ../compat/wayland-xdg-shell-v5-protocol.c appmenu_interface.cpp + blur_interface.cpp buffer_interface.cpp clientconnection.cpp compositor_interface.cpp + contrast_interface.cpp datadevice_interface.cpp datadevicemanager_interface.cpp dataoffer_interface.cpp datasource_interface.cpp display.cpp dpms_interface.cpp + eglstream_controller_interface.cpp + fakeinput_interface.cpp filtered_display.cpp global.cpp idle_interface.cpp idleinhibit_interface.cpp idleinhibit_interface_v1.cpp - fakeinput_interface.cpp keyboard_interface.cpp keystate_interface.cpp linuxdmabuf_v1_interface.cpp - remote_access_interface.cpp - outputconfiguration_interface.cpp + output_interface.cpp outputchangeset.cpp - outputmanagement_interface.cpp + outputconfiguration_interface.cpp outputdevice_interface.cpp - output_interface.cpp - pointer_interface.cpp + outputmanagement_interface.cpp plasmashell_interface.cpp plasmavirtualdesktop_interface.cpp plasmawindowmanagement_interface.cpp + pointer_interface.cpp pointerconstraints_interface.cpp pointerconstraints_interface_v1.cpp pointergestures_interface.cpp @@ -36,32 +39,29 @@ region_interface.cpp relativepointer_interface.cpp relativepointer_interface_v1.cpp + remote_access_interface.cpp resource.cpp seat_interface.cpp - slide_interface.cpp - shadow_interface.cpp - blur_interface.cpp - contrast_interface.cpp server_decoration_interface.cpp server_decoration_palette_interface.cpp + shadow_interface.cpp shell_interface.cpp - surface_interface.cpp + slide_interface.cpp subcompositor_interface.cpp - touch_interface.cpp + surface_interface.cpp textinput_interface.cpp textinput_interface_v0.cpp textinput_interface_v2.cpp + touch_interface.cpp xdgdecoration_interface.cpp + xdgforeign_interface.cpp + xdgforeign_v2_interface.cpp + xdgoutput_interface.cpp xdgshell_interface.cpp + xdgshell_stable_interface.cpp xdgshell_v5_interface.cpp - xdgforeign_v2_interface.cpp - xdgforeign_interface.cpp xdgshell_v5_interface.cpp xdgshell_v6_interface.cpp - xdgshell_stable_interface.cpp - xdgoutput_interface.cpp - eglstream_controller_interface.cpp - ../compat/wayland-xdg-shell-v5-protocol.c ) ecm_qt_declare_logging_category(SERVER_LIB_SRCS HEADER logging.h IDENTIFIER KWAYLAND_SERVER CATEGORY_NAME kwayland-server DEFAULT_SEVERITY Critical) @@ -221,62 +221,62 @@ ) set(SERVER_GENERATED_SRCS - ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-management-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-management-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-blur-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-blur-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-contrast-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-contrast-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-dpms-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-dpms-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-eglstream-controller-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-fake-input-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-fake-input-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-inhibit-unstable-v1-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-inhibit-unstable-v1-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-linux-dmabuf-unstable-v1-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-org_kde_kwin_outputdevice-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-org_kde_kwin_outputdevice-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-management-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-management-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-shell-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-shell-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-shell-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-virtual-desktop-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-shell-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-virtual-desktop-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-virtual-desktop-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-window-management-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-plasma-window-management-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-constraints-unstable-v1-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-constraints-unstable-v1-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-qt-surface-extension-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-qt-surface-extension-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-fake-input-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-fake-input-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-shadow-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-shadow-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-dpms-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-dpms-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-blur-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-blur-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-contrast-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-contrast-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-relativepointer-unstable-v1-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-relativepointer-unstable-v1-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-slide-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-slide-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-server_decoration-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-server_decoration-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-server_decoration_palette-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-server_decoration_palette-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-shadow-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-shadow-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-slide-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-slide-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-input-unstable-v2-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-input-unstable-v2-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-gestures-unstable-v1-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-constraints-unstable-v1-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-pointer-constraints-unstable-v1-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-text-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-decoration-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-decoration-server-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-foreign-unstable-v2-client-protocol.h ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-foreign-unstable-v2-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-inhibit-unstable-v1-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-idle-inhibit-unstable-v1-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-output-unstable-v1-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-decoration-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-decoration-client-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-eglstream-controller-server-protocol.h - ${CMAKE_CURRENT_BINARY_DIR}/wayland-linux-dmabuf-unstable-v1-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-server-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-client-protocol.h + ${CMAKE_CURRENT_BINARY_DIR}/wayland-xdg-shell-v6-server-protocol.h ) set_source_files_properties(${SERVER_GENERATED_SRCS} PROPERTIES SKIP_AUTOMOC ON) @@ -313,10 +313,10 @@ ${CMAKE_CURRENT_BINARY_DIR}/KWayland/Server/kwaylandserver_export.h appmenu_interface.h blur_interface.h - contrast_interface.h buffer_interface.h clientconnection.h compositor_interface.h + contrast_interface.h datadevice_interface.h datadevicemanager_interface.h dataoffer_interface.h @@ -324,28 +324,29 @@ display.h dpms_interface.h eglstream_controller_interface.h - filtered_display.h fakeinput_interface.h + filtered_display.h global.h idle_interface.h idleinhibit_interface.h keyboard_interface.h keystate_interface.h - remote_access_interface.h - outputdevice_interface.h + linuxdmabuf_v1_interface.h + output_interface.h outputchangeset.h outputconfiguration_interface.h + outputdevice_interface.h outputmanagement_interface.h - output_interface.h - pointer_interface.h - pointerconstraints_interface.h - pointergestures_interface.h plasmashell_interface.h plasmavirtualdesktop_interface.h plasmawindowmanagement_interface.h + pointer_interface.h + pointerconstraints_interface.h + pointergestures_interface.h qtsurfaceextension_interface.h region_interface.h relativepointer_interface.h + remote_access_interface.h resource.h seat_interface.h server_decoration_interface.h @@ -358,10 +359,9 @@ textinput_interface.h touch_interface.h xdgdecoration_interface.h - xdgshell_interface.h xdgforeign_interface.h xdgoutput_interface.h - linuxdmabuf_v1_interface.h + xdgshell_interface.h ) install(FILES @@ -371,6 +371,7 @@ # make available to ecm_add_qch in parent folder set(KWaylandServer_APIDOX_SRCS ${SERVER_LIB_HEADERS} PARENT_SCOPE) +set(KWaylandServer_APIDOX_BUILD_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR} PARENT_SCOPE) include(ECMGeneratePriFile) ecm_generate_pri_file(BASE_NAME KWaylandServer LIB_NAME KF5WaylandServer DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/server/datadevice_interface.h new/kwayland-5.63.0/src/server/datadevice_interface.h --- old/kwayland-5.62.0/src/server/datadevice_interface.h 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/server/datadevice_interface.h 2019-10-06 11:37:54.000000000 +0200 @@ -38,7 +38,12 @@ class SurfaceInterface; /** - * @brief Represents the Resource for the wl_data_device interface. + * @brief DataDeviceInterface allows clients to share data by copy-and-paste and drag-and-drop. + * + * The data device is per seat. + * Copy-and-paste use the selection functions. + * + * Represents the Resource for the wl_data_device interface. * * @see SeatInterface * @see DataSourceInterface diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/server/dpms_interface.h new/kwayland-5.63.0/src/server/dpms_interface.h --- old/kwayland-5.62.0/src/server/dpms_interface.h 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/server/dpms_interface.h 2019-10-06 11:37:54.000000000 +0200 @@ -33,12 +33,13 @@ class Display; /** - * @brief Global for the org_kde_kwin_dpms_manager interface. + * @brief Global for server side Display Power Management Signaling interface. * - * If the DpmsManagerInterface is created it allows a client to - * query the Dpms state on a given OutputInterface and request - * changes for it. The code interaction happens only via the - * OutputInterface. + * A DpmsManagerInterface allows a client to query the DPMS state + * on a given OutputInterface and request changes to it. + * Server-side the interaction happens only via the OutputInterface, + * for clients the Dpms class provides the API. + * This global implements org_kde_kwin_dpms_manager. * * To create a DpmsManagerInterface use: * @code diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/server/keyboard_interface.cpp new/kwayland-5.63.0/src/server/keyboard_interface.cpp --- old/kwayland-5.62.0/src/server/keyboard_interface.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/server/keyboard_interface.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -61,7 +61,7 @@ wl_array keys; wl_array_init(&keys); const auto states = seat->pressedKeys(); - for (auto it = states.begin(); it != states.end(); ++it) { + for (auto it = states.constBegin(); it != states.constEnd(); ++it) { uint32_t *k = reinterpret_cast<uint32_t*>(wl_array_add(&keys, sizeof(uint32_t))); *k = *it; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/server/output_interface.cpp new/kwayland-5.63.0/src/server/output_interface.cpp --- old/kwayland-5.62.0/src/server/output_interface.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/server/output_interface.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -115,8 +115,8 @@ { for (auto it = s_privates.constBegin(); it != s_privates.constEnd(); ++it) { const auto &resources = (*it)->resources; - auto rit = std::find_if(resources.begin(), resources.end(), [native] (const ResourceData &data) { return data.resource == native; }); - if (rit != resources.end()) { + auto rit = std::find_if(resources.constBegin(), resources.constEnd(), [native] (const ResourceData &data) { return data.resource == native; }); + if (rit != resources.constEnd()) { return (*it); } } @@ -153,12 +153,12 @@ QSize OutputInterface::pixelSize() const { Q_D(); - auto it = std::find_if(d->modes.begin(), d->modes.end(), + auto it = std::find_if(d->modes.constBegin(), d->modes.constEnd(), [](const Mode &mode) { return mode.flags.testFlag(ModeFlag::Current); } ); - if (it == d->modes.end()) { + if (it == d->modes.constEnd()) { return QSize(); } return (*it).size; @@ -167,12 +167,12 @@ int OutputInterface::refreshRate() const { Q_D(); - auto it = std::find_if(d->modes.begin(), d->modes.end(), + auto it = std::find_if(d->modes.constBegin(), d->modes.constEnd(), [](const Mode &mode) { return mode.flags.testFlag(ModeFlag::Current); } ); - if (it == d->modes.end()) { + if (it == d->modes.constEnd()) { return 60000; } return (*it).refreshRate; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/server/outputdevice_interface.cpp new/kwayland-5.63.0/src/server/outputdevice_interface.cpp --- old/kwayland-5.62.0/src/server/outputdevice_interface.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/server/outputdevice_interface.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -135,7 +135,7 @@ { Q_D(); connect(this, &OutputDeviceInterface::currentModeChanged, this, - [this, d] { + [d] { Q_ASSERT(d->currentMode.id >= 0); for (auto it = d->resources.constBegin(); it != d->resources.constEnd(); ++it) { d->sendMode((*it).resource, d->currentMode); @@ -144,14 +144,14 @@ wl_display_flush_clients(*(d->display)); } ); - connect(this, &OutputDeviceInterface::subPixelChanged, this, [this, d] { d->updateGeometry(); }); - connect(this, &OutputDeviceInterface::transformChanged, this, [this, d] { d->updateGeometry(); }); - connect(this, &OutputDeviceInterface::globalPositionChanged, this, [this, d] { d->updateGeometry(); }); - connect(this, &OutputDeviceInterface::modelChanged, this, [this, d] { d->updateGeometry(); }); - connect(this, &OutputDeviceInterface::manufacturerChanged, this, [this, d] { d->updateGeometry(); }); - connect(this, &OutputDeviceInterface::scaleFChanged, this, [this, d] { d->updateScale(); }); - connect(this, &OutputDeviceInterface::scaleChanged, this, [this, d] { d->updateScale(); }); - connect(this, &OutputDeviceInterface::colorCurvesChanged, this, [this, d] { d->updateColorCurves(); }); + connect(this, &OutputDeviceInterface::subPixelChanged, this, [d] { d->updateGeometry(); }); + connect(this, &OutputDeviceInterface::transformChanged, this, [d] { d->updateGeometry(); }); + connect(this, &OutputDeviceInterface::globalPositionChanged, this, [d] { d->updateGeometry(); }); + connect(this, &OutputDeviceInterface::modelChanged, this, [d] { d->updateGeometry(); }); + connect(this, &OutputDeviceInterface::manufacturerChanged, this, [d] { d->updateGeometry(); }); + connect(this, &OutputDeviceInterface::scaleFChanged, this, [d] { d->updateScale(); }); + connect(this, &OutputDeviceInterface::scaleChanged, this, [d] { d->updateScale(); }); + connect(this, &OutputDeviceInterface::colorCurvesChanged, this, [d] { d->updateColorCurves(); }); } OutputDeviceInterface::~OutputDeviceInterface() = default; @@ -239,12 +239,12 @@ emitChanges(); return; } else { - auto idIt = std::find_if(d->modes.begin(), d->modes.end(), + auto idIt = std::find_if(d->modes.constBegin(), d->modes.constEnd(), [mode](const Mode &mode_it) { return mode.id == mode_it.id; } ); - if (idIt != d->modes.end()) { + if (idIt != d->modes.constEnd()) { qCWarning(KWAYLAND_SERVER) << "Duplicate Mode id" << mode.id << ": not adding mode" << mode.size << mode.refreshRate; return; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/server/seat_interface.cpp new/kwayland-5.63.0/src/server/seat_interface.cpp --- old/kwayland-5.62.0/src/server/seat_interface.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/server/seat_interface.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -71,13 +71,13 @@ { Q_D(); connect(this, &SeatInterface::nameChanged, this, - [this, d] { + [d] { for (auto it = d->resources.constBegin(); it != d->resources.constEnd(); ++it) { d->sendName(*it); } } ); - auto sendCapabilitiesAll = [this, d] { + auto sendCapabilitiesAll = [d] { for (auto it = d->resources.constBegin(); it != d->resources.constEnd(); ++it) { d->sendCapabilities(*it); } @@ -192,7 +192,7 @@ return nullptr; } - for (auto it = interfaces.begin(); it != interfaces.end(); ++it) { + for (auto it = interfaces.constBegin(); it != interfaces.constEnd(); ++it) { if ((*it)->client() == surface->client()) { return (*it); } @@ -209,7 +209,7 @@ return ret; } - for (auto it = interfaces.begin(); it != interfaces.end(); ++it) { + for (auto it = interfaces.constBegin(); it != interfaces.constEnd(); ++it) { if ((*it)->client() == surface->client() && (*it)->resource()) { ret << *it; } @@ -225,7 +225,7 @@ return false; } bool calledAtLeastOne = false; - for (auto it = interfaces.begin(); it != interfaces.end(); ++it) { + for (auto it = interfaces.constBegin(); it != interfaces.constEnd(); ++it) { if ((*it)->client() == surface->client() && (*it)->resource()) { method(*it); calledAtLeastOne = true; @@ -1271,7 +1271,7 @@ { Q_D(); QVector<quint32> keys; - for (auto it = d->keys.states.begin(); it != d->keys.states.end(); ++it) { + for (auto it = d->keys.states.constBegin(); it != d->keys.states.constEnd(); ++it) { if (it.value() == Private::Keyboard::State::Pressed) { keys << it.key(); } @@ -1502,7 +1502,7 @@ { Q_D(); const auto &serials = d->globalPointer.buttonSerials; - for (auto it = serials.begin(), end = serials.end(); it != end; it++) { + for (auto it = serials.constBegin(), end = serials.constEnd(); it != end; it++) { if (it.value() == serial) { return isPointerButtonPressed(it.key()); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/server/surface_interface_p.h new/kwayland-5.63.0/src/server/surface_interface_p.h --- old/kwayland-5.62.0/src/server/surface_interface_p.h 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/server/surface_interface_p.h 2019-10-06 11:37:54.000000000 +0200 @@ -23,6 +23,7 @@ #include "surface_interface.h" #include "resource_p.h" // Qt +#include <QHash> #include <QVector> // Wayland #include <wayland-server.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/tools/generator.cpp new/kwayland-5.63.0/src/tools/generator.cpp --- old/kwayland-5.62.0/src/tools/generator.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/tools/generator.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -500,7 +500,7 @@ QStringLiteral("user.name") }); git->setProgram(QStringLiteral("git")); - connect(git, static_cast<void (QProcess::*)(int)>(&QProcess::finished), this, + connect(git, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, [this, git] { QMutexLocker locker(&m_mutex); m_authorName = QString::fromLocal8Bit(git->readAllStandardOutput()).trimmed(); @@ -520,7 +520,7 @@ QStringLiteral("user.email") }); git->setProgram(QStringLiteral("git")); - connect(git, static_cast<void (QProcess::*)(int)>(&QProcess::finished), this, + connect(git, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, [this, git] { QMutexLocker locker(&m_mutex); m_authorEmail = QString::fromLocal8Bit(git->readAllStandardOutput()).trimmed(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/src/tools/testserver/testserver.cpp new/kwayland-5.63.0/src/tools/testserver/testserver.cpp --- old/kwayland-5.62.0/src/tools/testserver/testserver.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/src/tools/testserver/testserver.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -183,8 +183,7 @@ p->setProcessEnvironment(environment); auto finishedSignal = static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished); connect(p, finishedSignal, QCoreApplication::instance(), &QCoreApplication::exit); - auto errorSignal = static_cast<void (QProcess::*)(QProcess::ProcessError)>(&QProcess::error); - connect(p, errorSignal, this, + connect(p, &QProcess::errorOccurred, this, [] { QCoreApplication::instance()->exit(1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.62.0/tests/pasteclient.cpp new/kwayland-5.63.0/tests/pasteclient.cpp --- old/kwayland-5.62.0/tests/pasteclient.cpp 2019-09-07 14:38:08.000000000 +0200 +++ new/kwayland-5.63.0/tests/pasteclient.cpp 2019-10-06 11:37:54.000000000 +0200 @@ -149,11 +149,11 @@ return; } const auto &mimeTypes = dataOffer->offeredMimeTypes(); - auto it = std::find_if(mimeTypes.begin(), mimeTypes.end(), + auto it = std::find_if(mimeTypes.constBegin(), mimeTypes.constEnd(), [](const QMimeType &type) { return type.inherits(QStringLiteral("text/plain")); }); - if (it == mimeTypes.end()) { + if (it == mimeTypes.constEnd()) { return; } int pipeFds[2];
