Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2021-06-16 20:34:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new.32437 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Wed Jun 16 20:34:15 2021 rev:95 rq:899769 version:5.83.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2021-05-10 15:37:41.869966310 +0200 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new.32437/kwindowsystem.changes 2021-06-16 20:35:55.583231320 +0200 @@ -1,0 +2,13 @@ +Sat Jun 5 11:59:18 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.83.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.83.0 +- Changes since 5.82.0: + * Provide KWindowSystem::lastInputSerial + * Include API for wayland's xdg_activation_V1 + * Bump required CMake version to 3.16 + * Drop Qt5Widgets dependency if KWINDOWSYSTEM_NO_WIDGETS=ON + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.82.0.tar.xz kwindowsystem-5.82.0.tar.xz.sig New: ---- kwindowsystem-5.83.0.tar.xz kwindowsystem-5.83.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.Qe0vIZ/_old 2021-06-16 20:35:55.999232030 +0200 +++ /var/tmp/diff_new_pack.Qe0vIZ/_new 2021-06-16 20:35:56.003232036 +0200 @@ -17,14 +17,14 @@ %define lname libKF5WindowSystem5 -%define _tar_path 5.82 +%define _tar_path 5.83 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} %bcond_without lang Name: kwindowsystem -Version: 5.82.0 +Version: 5.83.0 Release: 0 Summary: KDE Access to window manager License: LGPL-2.1-or-later ++++++ kwindowsystem-5.82.0.tar.xz -> kwindowsystem-5.83.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/.gitignore new/kwindowsystem-5.83.0/.gitignore --- old/kwindowsystem-5.82.0/.gitignore 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/.gitignore 2021-06-05 11:25:50.000000000 +0200 @@ -25,3 +25,4 @@ .clangd .idea /cmake-build* +.cache diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/CMakeLists.txt new/kwindowsystem-5.83.0/CMakeLists.txt --- old/kwindowsystem-5.82.0/CMakeLists.txt 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/CMakeLists.txt 2021-06-05 11:25:50.000000000 +0200 @@ -1,11 +1,11 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.82.0") # handled by release scripts +set(KF_VERSION "5.83.0") # handled by release scripts project(KWindowSystem VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.82.0 NO_MODULE) +find_package(ECM 5.83.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -48,7 +48,10 @@ # Dependencies set(REQUIRED_QT_VERSION 5.15.0) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Gui Widgets) +find_package(Qt5Gui ${REQUIRED_QT_VERSION} CONFIG REQUIRED) +if(NOT KWINDOWSYSTEM_NO_WIDGETS) + find_package(Qt5Widgets ${REQUIRED_QT_VERSION} CONFIG REQUIRED) +endif() if (APPLE) cmake_find_frameworks(Carbon) @@ -78,7 +81,6 @@ # Subdirectories ecm_install_po_files_as_qm(po) -add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f00) add_subdirectory(src) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/KF5WindowSystemConfig.cmake.in new/kwindowsystem-5.83.0/KF5WindowSystemConfig.cmake.in --- old/kwindowsystem-5.82.0/KF5WindowSystemConfig.cmake.in 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/KF5WindowSystemConfig.cmake.in 2021-06-05 11:25:50.000000000 +0200 @@ -1,8 +1,11 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) +find_dependency(Qt5Gui @REQUIRED_QT_VERSION@) +if(NOT @KWINDOWSYSTEM_NO_WIDGETS@) +find_dependency(Qt5Widgets @REQUIRED_QT_VERSION@) +endif() include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") @PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/autotests/CMakeLists.txt new/kwindowsystem-5.83.0/autotests/CMakeLists.txt --- old/kwindowsystem-5.82.0/autotests/CMakeLists.txt 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/autotests/CMakeLists.txt 2021-06-05 11:25:50.000000000 +0200 @@ -6,7 +6,7 @@ include(ECMMarkAsTest) include(ECMAddTests) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) add_subdirectory(helper) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/po/zh_CN/kwindowsystem5_qt.po new/kwindowsystem-5.83.0/po/zh_CN/kwindowsystem5_qt.po --- old/kwindowsystem-5.82.0/po/zh_CN/kwindowsystem5_qt.po 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/po/zh_CN/kwindowsystem5_qt.po 2021-06-05 11:25:50.000000000 +0200 @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2021-04-24 15:43\n" +"PO-Revision-Date: 2021-06-03 16:05\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/src/CMakeLists.txt new/kwindowsystem-5.83.0/src/CMakeLists.txt --- old/kwindowsystem-5.82.0/src/CMakeLists.txt 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/src/CMakeLists.txt 2021-06-05 11:25:50.000000000 +0200 @@ -1,10 +1,11 @@ - - configure_file(config-kwindowsystem.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-kwindowsystem.h ) -ecm_create_qm_loader(kwindowsystem_QM_LOADER kwindowsystem5_qt) +add_library(KF5WindowSystem) +add_library(KF5::WindowSystem ALIAS KF5WindowSystem) + +ecm_create_qm_loader(KF5WindowSystem kwindowsystem5_qt) -set(kwindowsystem_SRCS +target_sources(KF5WindowSystem PRIVATE kkeyserver.cpp kstartupinfo.cpp kusertimestamp.cpp @@ -16,9 +17,8 @@ platforms/wayland/kwindowsystem.cpp pluginwrapper.cpp kwindowsystemplugininterface.cpp - ${kwindowsystem_QM_LOADER} ) -ecm_qt_declare_logging_category(kwindowsystem_SRCS +ecm_qt_declare_logging_category(KF5WindowSystem HEADER kwindowsystem_debug.h IDENTIFIER LOG_KWINDOWSYSTEM CATEGORY_NAME kf.windowsystem @@ -27,7 +27,7 @@ DESCRIPTION "KWindowSystem" EXPORT KWINDOWSYSTEM ) -ecm_qt_declare_logging_category(kwindowsystem_SRCS +ecm_qt_declare_logging_category(KF5WindowSystem HEADER kwindowsystem_xcb_debug.h IDENTIFIER LOG_KKEYSERVER_X11 CATEGORY_NAME kf.windowsystem.keyserver.x11 @@ -38,7 +38,7 @@ ) if (KWINDOWSYSTEM_HAVE_X11) - set(kwindowsystem_SRCS ${kwindowsystem_SRCS} + target_sources(KF5WindowSystem PRIVATE platforms/xcb/kselectionowner.cpp platforms/xcb/kselectionwatcher.cpp platforms/xcb/kxerrorhandler.cpp @@ -46,48 +46,67 @@ ) endif() -set(platformLinkLibraries) - if (KWINDOWSYSTEM_HAVE_X11) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/xcb) if(NOT X11_Xrender_LIB) message(FATAL_ERROR "The XRender library could not be found. Please install the development package for it.") endif() if(NOT X11_Xfixes_LIB) message(FATAL_ERROR "The XFixes library could not be found. Please install the development package for it.") endif() - set(platformLinkLibraries Qt5::X11Extras ${X11_LIBRARIES} ${X11_Xfixes_LIB} ${X11_Xrender_LIB} ${XCB_XCB_LIBRARY} ${XCB_KEYSYMS_LIBRARY}) - set(kwindowsystem_SRCS ${kwindowsystem_SRCS} platforms/xcb/kkeyserver.cpp - platforms/xcb/kxmessages.cpp - platforms/xcb/netwm.cpp ) + target_include_directories(KF5WindowSystem + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/xcb + ) + target_link_libraries(KF5WindowSystem + PRIVATE + Qt5::X11Extras + ${X11_LIBRARIES} + ${X11_Xfixes_LIB} + ${X11_Xrender_LIB} + ${XCB_XCB_LIBRARY} + ${XCB_KEYSYMS_LIBRARY} + ) + target_sources(KF5WindowSystem PRIVATE + platforms/xcb/kkeyserver.cpp + platforms/xcb/kxmessages.cpp + platforms/xcb/netwm.cpp + ) endif () if (APPLE) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/osx) - set(kwindowsystem_SRCS ${kwindowsystem_SRCS} platforms/osx/kkeyserver.cpp + target_include_directories(KF5WindowSystem + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/osx) + target_sources(KF5WindowSystem PRIVATE + platforms/osx/kkeyserver.cpp # kwindowsystem_mac.cpp # FIXME: adjust kwindowinfo_mac to inherit from KWindowInfoPrivate # kwindowinfo_mac.cpp -) - set(platformLinkLibraries "-framework CoreFoundation -framework Carbon") + ) + target_link_libraries(KF5WindowSystem + PRIVATE + "-framework CoreFoundation -framework Carbon" + ) endif () if (WIN32) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/platforms/windows) - set(kwindowsystem_SRCS ${kwindowsystem_SRCS} platforms/windows/kkeyserver.cpp + target_include_directories(KF5WindowSystem + PRIVATE + ${CMAKE_CURRENT_SOURCE_DIR}/platforms/windows + ) + target_sources(KF5WindowSystem PRIVATE + platforms/windows/kkeyserver.cpp # kwindowsystem_win.cpp # FIXME: adjust kwindowinfo_win to inherit from KWindowInfoPrivate # kwindowinfo_win.cpp -) - set(platformLinkLibraries - Qt5::WinExtras # QtWin::fromHICON(), QtWin::toHICON() - ws2_32 # gethostname() + ) + target_link_libraries(KF5WindowSystem + PRIVATE + Qt5::WinExtras # QtWin::fromHICON(), QtWin::toHICON() + ws2_32 # gethostname() ) endif () -add_library(KF5WindowSystem ${kwindowsystem_SRCS}) -add_library(KF5::WindowSystem ALIAS KF5WindowSystem) - ecm_generate_export_header(KF5WindowSystem BASE_NAME KWindowSystem GROUP_BASE_NAME KF @@ -101,7 +120,6 @@ target_link_libraries(KF5WindowSystem PUBLIC Qt5::Gui - PRIVATE ${platformLinkLibraries} ) if(NOT KWINDOWSYSTEM_NO_WIDGETS) target_link_libraries(KF5WindowSystem PUBLIC Qt5::Widgets) @@ -114,7 +132,7 @@ target_include_directories(KF5WindowSystem PUBLIC ${XCB_XCB_INCLUDE_DIR} ${X11_X11_INCLUDE_PATH}) endif() -set_target_properties(KF5WindowSystem PROPERTIES VERSION ${KWINDOWSYSTEM_VERSION_STRING} +set_target_properties(KF5WindowSystem PROPERTIES VERSION ${KWINDOWSYSTEM_VERSION} SOVERSION ${KWINDOWSYSTEM_SOVERSION} EXPORT_NAME WindowSystem ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/src/kwindoweffects.h new/kwindowsystem-5.83.0/src/kwindoweffects.h --- old/kwindowsystem-5.82.0/src/kwindoweffects.h 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/src/kwindoweffects.h 2021-06-05 11:25:50.000000000 +0200 @@ -58,8 +58,9 @@ * * @deprecated Since 5.82, Use slideWindow(QWindow) overload */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 82, "Use slideWindow(QWindow) overload") -KWINDOWSYSTEM_EXPORT void slideWindow(WId id, SlideFromLocation location, int offset = -1); +void slideWindow(WId id, SlideFromLocation location, int offset = -1); #endif #if KWINDOWSYSTEM_ENABLE_DEPRECATED_SINCE(5, 62) @@ -72,8 +73,9 @@ * Desktop and Floating won't have effect. * @deprecated since 5.62, use slideWindow(widget->effectiveWinId(), location); */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 62, "Use KWindowEffects::slideWindow(WId, SlideFromLocation, int)") -KWINDOWSYSTEM_EXPORT void slideWindow(QWidget *widget, SlideFromLocation location); +void slideWindow(QWidget *widget, SlideFromLocation location); #endif #if KWINDOWSYSTEM_ENABLE_DEPRECATED_SINCE(5, 81) @@ -83,8 +85,9 @@ * @param ids all the windows we want the size * @deprecated since 5.81, fetch sizes through KWindowSystem instead */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 81, "Fetch sizes through KWindowSystem instead") -KWINDOWSYSTEM_EXPORT QList<QSize> windowSizes(const QList<WId> &ids); +QList<QSize> windowSizes(const QList<WId> &ids); #endif #if KWINDOWSYSTEM_ENABLE_DEPRECATED_SINCE(5, 82) @@ -97,8 +100,9 @@ * * @deprecated Since 5.82, Use org.kde.KWin.PresentWindows d-bus api */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 82, "Use org.kde.KWin.PresentWindows d-bus api") -KWINDOWSYSTEM_EXPORT void presentWindows(WId controller, const QList<WId> &ids); +void presentWindows(WId controller, const QList<WId> &ids); #endif #if KWINDOWSYSTEM_ENABLE_DEPRECATED_SINCE(5, 82) @@ -111,8 +115,9 @@ * * @deprecated Since 5.82, Use org.kde.KWin.PresentWindows d-bus api */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 82, "Use org.kde.KWin.PresentWindows d-bus api") -KWINDOWSYSTEM_EXPORT void presentWindows(WId controller, int desktop = NET::OnAllDesktops); +void presentWindows(WId controller, int desktop = NET::OnAllDesktops); #endif #if KWINDOWSYSTEM_ENABLE_DEPRECATED_SINCE(5, 82) @@ -125,8 +130,9 @@ * * @deprecated Since 5.82, Use org.kde.KWin.HighlightWindow d-bus api */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 82, "Use org.kde.KWin.HighlightWindow d-bus api") -KWINDOWSYSTEM_EXPORT void highlightWindows(WId controller, const QList<WId> &ids); +void highlightWindows(WId controller, const QList<WId> &ids); #endif #if KWINDOWSYSTEM_ENABLE_DEPRECATED_SINCE(5, 82) @@ -149,8 +155,9 @@ * * @deprecated Since 5.82, use enableBlurBehind(QWindow) overload. */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 82, "Use enableBlurBehind(QWindow) overload") -KWINDOWSYSTEM_EXPORT void enableBlurBehind(WId window, bool enable = true, const QRegion ®ion = QRegion()); +void enableBlurBehind(WId window, bool enable = true, const QRegion ®ion = QRegion()); #endif #if KWINDOWSYSTEM_ENABLE_DEPRECATED_SINCE(5, 82) @@ -176,9 +183,9 @@ * * @deprecated Since 5.82, use enableBackgroundContrast(QWindow) overload. */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 82, "Use enableBackgroundContrast(QWindow) overload") -KWINDOWSYSTEM_EXPORT void -enableBackgroundContrast(WId window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()); +void enableBackgroundContrast(WId window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()); #endif #if KWINDOWSYSTEM_ENABLE_DEPRECATED_SINCE(5, 67) @@ -190,8 +197,9 @@ * @param window The window for which to enable the blur effect * @deprecated since 5.67, support for dashboard windows was removed */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 67, "Support for dashboard windows was removed") -KWINDOWSYSTEM_EXPORT void markAsDashboard(WId window); +void markAsDashboard(WId window); #endif /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/src/kwindowsystem.cpp new/kwindowsystem-5.83.0/src/kwindowsystem.cpp --- old/kwindowsystem-5.82.0/src/kwindowsystem.cpp 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/src/kwindowsystem.cpp 2021-06-05 11:25:50.000000000 +0200 @@ -772,3 +772,34 @@ { return platform() == Platform::Wayland; } + +void KWindowSystem::requestXdgActivationToken(QWindow *win, uint32_t serial, const QString &app_id) +{ + Q_D(KWindowSystem); + auto dv2 = dynamic_cast<KWindowSystemPrivateV2 *>(d); + if (!dv2) { + Q_EMIT KWindowSystem::self()->xdgActivationTokenArrived(serial, {}); + return; + } + dv2->requestToken(win, serial, app_id); +} + +void KWindowSystem::setCurrentXdgActivationToken(const QString &token) +{ + Q_D(KWindowSystem); + auto dv2 = dynamic_cast<KWindowSystemPrivateV2 *>(d); + if (!dv2) { + return; + } + dv2->setCurrentToken(token); +} + +quint32 KWindowSystem::lastInputSerial(QWindow *window) +{ + Q_D(KWindowSystem); + auto dv2 = dynamic_cast<KWindowSystemPrivateV2 *>(d); + if (!dv2) { + return 0; + } + return dv2->lastInputSerial(window); +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/src/kwindowsystem.h new/kwindowsystem-5.83.0/src/kwindowsystem.h --- old/kwindowsystem-5.82.0/src/kwindowsystem.h 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/src/kwindowsystem.h 2021-06-05 11:25:50.000000000 +0200 @@ -652,6 +652,34 @@ **/ static bool isPlatformWayland(); + /** + * Requests an xdg_activation_v1 token for a specific window. + * + * @p win window in behalf this request is made + * @p serial of the event that triggered the request + * @p app_id identifier of the application that we are launching + * + * @see currentSerial + * @since 5.83 + */ + static void requestXdgActivationToken(QWindow *win, uint32_t serial, const QString &app_id); + + /** + * Sets the @p token that will be used when activateWindow is called next + * + * @since 5.83 + */ + static void setCurrentXdgActivationToken(const QString &token); + + /** + * Offers the seat's current serial + * + * This will mostly be useful on wayland sessions. + * + * @since 5.83 + */ + static quint32 lastInputSerial(QWindow *window); + Q_SIGNALS: /** @@ -781,6 +809,15 @@ */ void compositingChanged(bool enabled); + /** + * Activation @p token to pass to the client. + * + * @see requestXdgActivationToken + * @see setCurrentXdgActivationToken + * @since 5.83 + */ + void xdgActivationTokenArrived(int serial, const QString &token); + protected: void connectNotify(const QMetaMethod &signal) override; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/src/kwindowsystem_p.h new/kwindowsystem-5.83.0/src/kwindowsystem_p.h --- old/kwindowsystem-5.82.0/src/kwindowsystem_p.h 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/src/kwindowsystem_p.h 2021-06-05 11:25:50.000000000 +0200 @@ -79,4 +79,12 @@ virtual void connectNotify(const QMetaMethod &signal) = 0; }; +class KWINDOWSYSTEM_EXPORT KWindowSystemPrivateV2 : public KWindowSystemPrivate +{ +public: + virtual void requestToken(QWindow *win, uint32_t serial, const QString &app_id) = 0; + virtual void setCurrentToken(const QString &token) = 0; + virtual quint32 lastInputSerial(QWindow *window) = 0; +}; + #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/src/platforms/wayland/CMakeLists.txt new/kwindowsystem-5.83.0/src/platforms/wayland/CMakeLists.txt --- old/kwindowsystem-5.82.0/src/platforms/wayland/CMakeLists.txt 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/src/platforms/wayland/CMakeLists.txt 2021-06-05 11:25:50.000000000 +0200 @@ -1,9 +1,10 @@ -set(wayland_plugin_SRCS +add_library(KF5WindowSystemWaylandPlugin MODULE) + +target_sources(KF5WindowSystemWaylandPlugin PRIVATE kwindowsystem.cpp plugin.cpp ) -add_library(KF5WindowSystemWaylandPlugin MODULE ${wayland_plugin_SRCS}) target_link_libraries(KF5WindowSystemWaylandPlugin KF5WindowSystem ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/src/platforms/xcb/CMakeLists.txt new/kwindowsystem-5.83.0/src/platforms/xcb/CMakeLists.txt --- old/kwindowsystem-5.82.0/src/platforms/xcb/CMakeLists.txt 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/src/platforms/xcb/CMakeLists.txt 2021-06-05 11:25:50.000000000 +0200 @@ -1,4 +1,6 @@ -set(xcb_plugin_SRCS +add_library(KF5WindowSystemX11Plugin MODULE) + +target_sources(KF5WindowSystemX11Plugin PRIVATE kwindoweffects.cpp kwindowinfo.cpp kwindowshadow.cpp @@ -7,14 +9,13 @@ kxutils.cpp plugin.cpp ) -ecm_qt_declare_logging_category(xcb_plugin_SRCS +ecm_qt_declare_logging_category(KF5WindowSystemX11Plugin HEADER kwindowsystem_xcb_debug.h IDENTIFIER LOG_KKEYSERVER_X11 CATEGORY_NAME kf.windowsystem.keyserver.x11 DEFAULT_SEVERITY Warning ) -add_library(KF5WindowSystemX11Plugin MODULE ${xcb_plugin_SRCS}) target_link_libraries(KF5WindowSystemX11Plugin KF5WindowSystem Qt5::X11Extras diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/src/platforms/xcb/kkeyserver_x11.h new/kwindowsystem-5.83.0/src/platforms/xcb/kkeyserver_x11.h --- old/kwindowsystem-5.82.0/src/platforms/xcb/kkeyserver_x11.h 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/src/platforms/xcb/kkeyserver_x11.h 2021-06-05 11:25:50.000000000 +0200 @@ -137,8 +137,9 @@ * @return true if successful, false otherwise * @deprecated since 5.38, use symXModXToKeyQt in order to support numeric keypad keys too */ +KWINDOWSYSTEM_EXPORT KWINDOWSYSTEM_DEPRECATED_VERSION(5, 38, "Use KKeyServer::symXModXToKeyQt(uint32_t, uint16_t, int *)") -KWINDOWSYSTEM_EXPORT bool symXToKeyQt(uint sym, int *keyQt); +bool symXToKeyQt(uint sym, int *keyQt); #endif /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.82.0/tests/CMakeLists.txt new/kwindowsystem-5.83.0/tests/CMakeLists.txt --- old/kwindowsystem-5.82.0/tests/CMakeLists.txt 2021-05-01 14:41:38.000000000 +0200 +++ new/kwindowsystem-5.83.0/tests/CMakeLists.txt 2021-06-05 11:25:50.000000000 +0200 @@ -3,7 +3,7 @@ include(ECMMarkAsTest) -find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) +find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets) macro(kwindowsystem_executable_tests) foreach(_testname ${ARGN})
