diff --git a/3rdparty/ext_frameworks/CMakeLists.txt b/3rdparty/ext_frameworks/CMakeLists.txt index f310500d8f..c5fe733e55 100644 --- a/3rdparty/ext_frameworks/CMakeLists.txt +++ b/3rdparty/ext_frameworks/CMakeLists.txt @@ -1,244 +1,244 @@ SET(EXTPREFIX_frameworks "${EXTPREFIX}" ) # # All needed frameworks: # # Archive # Config # WidgetsAddons # Completion # CoreAddons # GuiAddons # I18n # ItemModels # ItemViews # WindowSystem # kimageformats # On Linux: # KCrash ExternalProject_Add( ext_extra_cmake_modules DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/extra-cmake-modules-5.60.0.zip - URL_MD5 c205e17d89028ab0b034e68081d5ebfb + URL https://download.kde.org/stable/frameworks/5.64/extra-cmake-modules-5.64.0.zip + URL_MD5 e8fa4bba6a534feb9d9e39db036923da PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ecm_install_to_share.diff INSTALL_DIR ${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" ) ExternalProject_Add( ext_karchive DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/karchive-5.60.0.zip - URL_MD5 50ae1495ef5b19898a06e43160d9b84d + URL https://download.kde.org/stable/frameworks/5.64/karchive-5.64.0.zip + URL_MD5 26c7f89bfde97bc85f887f81a2d0f648 PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/karchive.diff INSTALL_DIR ${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_extra_cmake_modules ) ExternalProject_Add( ext_kconfig DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kconfig-5.60.0.zip - URL_MD5 db96fdd78a574d07b09abb720dae1a06 + URL https://download.kde.org/stable/frameworks/5.64/kconfig-5.64.0.zip + URL_MD5 52858f7fdcd17d0c5680acf96dcaae9a PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kconfig.diff INSTALL_DIR ${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false -DKCONFIG_USE_DBUS=off UPDATE_COMMAND "" DEPENDS ext_karchive ) ExternalProject_Add( ext_kwidgetsaddons DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kwidgetsaddons-5.60.0.zip - URL_MD5 1b09306fe482dd5665b16a243eb2be94 + URL https://download.kde.org/stable/frameworks/5.64/kwidgetsaddons-5.64.0.zip + URL_MD5 d6578f8b5b4bf19fddb8c16918ec0117 INSTALL_DIR ${EXTPREFIX_frameworks} # PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwidgetsaddons.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kconfig ) ExternalProject_Add( ext_kcompletion DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kcompletion-5.60.0.zip - URL_MD5 a9848cb26ff96246769c56244f0db25f + URL https://download.kde.org/stable/frameworks/5.64/kcompletion-5.64.0.zip + URL_MD5 21fef280c2580da83df289707326d42a INSTALL_DIR ${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kwidgetsaddons ) ExternalProject_Add( ext_kcoreaddons DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kcoreaddons-5.60.0.zip - URL_MD5 da21c1532042c2c8a7e56f444c581196 + URL https://download.kde.org/stable/frameworks/5.64/kcoreaddons-5.64.0.zip + URL_MD5 670a74cda110da89d1a7b0fd832fca42 INSTALL_DIR ${EXTPREFIX_frameworks} PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/desktoptojson.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kcompletion ) ExternalProject_Add( ext_kguiaddons DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kguiaddons-5.60.0.zip - URL_MD5 f8aeea516e264c80df470efafab6ded0 + URL https://download.kde.org/stable/frameworks/5.64/kguiaddons-5.64.0.zip + URL_MD5 565dcb39e812463100dddaf3f02bd2a0 INSTALL_DIR ${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kcoreaddons ) if(APPLE) ExternalProject_Add( ext_ki18n DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/ki18n-5.60.0.zip - URL_MD5 e53f479f22ea17629319fec710dda036 + URL https://download.kde.org/stable/frameworks/5.64/ki18n-5.64.0.zip + URL_MD5 75a86675bf2b352b53cbcaece956b486 INSTALL_DIR ${EXTPREFIX_frameworks} PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kguiaddons ext_gettext ) else() ExternalProject_Add( ext_ki18n DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/ki18n-5.60.0.zip - URL_MD5 e53f479f22ea17629319fec710dda036 + URL https://download.kde.org/stable/frameworks/5.64/ki18n-5.64.0.zip + URL_MD5 75a86675bf2b352b53cbcaece956b486 INSTALL_DIR ${EXTPREFIX_frameworks} PATCH_COMMAND COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/ki18n-appdatalocation.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kguiaddons ) endif() ExternalProject_Add( ext_kitemmodels DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kitemmodels-5.60.0.zip - URL_MD5 c8f02881a65d496d6114bb2155cdfc36 + URL https://download.kde.org/stable/frameworks/5.64/kitemmodels-5.64.0.zip + URL_MD5 e561031cafe7af08de3c62f01fa154b2 INSTALL_DIR ${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_ki18n ) ExternalProject_Add( ext_kitemviews DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kitemviews-5.60.0.zip - URL_MD5 9d94b8da72f43fac39aa782f7efd941e + URL https://download.kde.org/stable/frameworks/5.64/kitemviews-5.64.0.zip + URL_MD5 bbd20e563e3f3cbc80252ba89d27962c INSTALL_DIR ${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kitemmodels ) ExternalProject_Add( ext_kimageformats DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kimageformats-5.60.0.zip - URL_MD5 a8b413560d12cd956d689784a056d6e0 + URL https://download.kde.org/stable/frameworks/5.64/kimageformats-5.64.0.zip + URL_MD5 744090cf90ddde84f51dcabd167dd607 INSTALL_DIR ${EXTPREFIX_frameworks} PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kimageformats.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kitemviews ) ExternalProject_Add( ext_kwindowsystem DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kwindowsystem-5.60.0.zip - URL_MD5 c15c29141b5edca67143b735a94d3f43 + URL https://download.kde.org/stable/frameworks/5.64/kwindowsystem-5.64.0.zip + URL_MD5 4e2819edb9d029ff33791d691637065a INSTALL_DIR ${EXTPREFIX_frameworks} PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/kwindowsystem-x11.diff CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kimageformats ) ExternalProject_Add( ext_kcrash DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} - URL http://download.kde.org/stable/frameworks/5.60/kcrash-5.60.0.zip - URL_MD5 7449a6f2b314b944ab2bed00124fe69b + URL https://download.kde.org/stable/frameworks/5.64/kcrash-5.64.0.zip + URL_MD5 2d4d9c074c2e1d19804618d3f291a568 INSTALL_DIR ${EXTPREFIX_frameworks} CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${EXTPREFIX_frameworks} -DCMAKE_BUILD_TYPE=${GLOBAL_BUILD_TYPE} ${GLOBAL_PROFILE} -DCMAKE_SYSTEM_PREFIX_PATH=${EXTPREFIX} -DBUILD_TESTING=false UPDATE_COMMAND "" DEPENDS ext_kwindowsystem ) diff --git a/3rdparty/ext_frameworks/kconfig.diff b/3rdparty/ext_frameworks/kconfig.diff index 6bbc38cf7b..5118be7f11 100644 --- a/3rdparty/ext_frameworks/kconfig.diff +++ b/3rdparty/ext_frameworks/kconfig.diff @@ -1,89 +1,71 @@ diff --git a/docs/options.md b/docs/options.md -index c634c00..5e59219 100644 +index 4a6e9bc..caca9f8 100644 --- a/docs/options.md +++ b/docs/options.md -@@ -96,4 +96,4 @@ They are: +@@ -93,4 +93,4 @@ They are: * `$QT_CACHE_HOME` - QStandardPaths::GenericCacheLocation * `$QT_CONFIG_HOME` - QStandardPaths::GenericConfigLocation -* `$QT_DATA_HOME` - QStandardPaths::GenericDataLocation +* `$QT_DATA_HOME` - QStandardPaths::AppDataLocation -diff --git a/src/core/kconfig.cpp b/src/core/kconfig.cpp -index e1b11ed..e3511cf 100644 ---- a/src/core/kconfig.cpp -+++ b/src/core/kconfig.cpp -@@ -237,7 +237,7 @@ QString KConfigPrivate::expandString(const QString &value) - env = QString::fromLocal8Bit(pEnv.constData()); - } else { - if (aVarName == QStringLiteral("QT_DATA_HOME")) { -- env = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation); -+ env = QStandardPaths::writableLocation(QStandardPaths::AppDataLocation); - } else if (aVarName == QStringLiteral("QT_CONFIG_HOME")) { - env = QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation); - } else if (aVarName == QStringLiteral("QT_CACHE_HOME")) { diff --git a/src/core/kdesktopfile.cpp b/src/core/kdesktopfile.cpp -index d9283ce..f869fb0 100644 +index 18ef852..c9691a0 100644 --- a/src/core/kdesktopfile.cpp +++ b/src/core/kdesktopfile.cpp -@@ -89,8 +89,8 @@ QString KDesktopFile::locateLocal(const QString &path) - } - } - // Relative to xdg data dir? (much more common) -- const QStringList lstGenericDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); -- for (const QString &dir : lstGenericDataLocation) { +@@ -82,11 +82,11 @@ QString KDesktopFile::locateLocal(const QString &path) + QString relativePath; + QChar plus(QLatin1Char('/')); + // Relative to config? (e.g. for autostart) +- const QStringList lstGenericConfigLocation = QStandardPaths::standardLocations(QStandardPaths::GenericConfigLocation); +- for (const QString &dir : lstGenericConfigLocation) { + const QStringList lstAppDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation); + for (const QString &dir : lstAppDataLocation) { if (path.startsWith(dir + plus)) { relativePath = path.mid(dir.length() + 1); +- return QStandardPaths::writableLocation(QStandardPaths::GenericConfigLocation) + QLatin1Char('/') + relativePath; ++ return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/') + relativePath; } -@@ -99,7 +99,7 @@ QString KDesktopFile::locateLocal(const QString &path) - // What now? The desktop file doesn't come from XDG_DATA_DIRS. Use filename only and hope for the best. - relativePath = path.mid(path.lastIndexOf(QLatin1Char('/')) + 1); } -- return QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + relativePath; -+ return QStandardPaths::writableLocation(QStandardPaths::AppDataLocation) + QLatin1Char('/') + relativePath; - } - - bool KDesktopFile::isDesktopFile(const QString &path) -@@ -136,8 +136,8 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path) + // Relative to xdg data dir? (much more common) +@@ -137,8 +137,8 @@ bool KDesktopFile::isAuthorizedDesktopFile(const QString &path) } } const QString servicesDir = QStringLiteral("kservices5/"); // KGlobal::dirs()->xdgDataRelativePath("services") - const QStringList lstGenericDataLocation = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); - for (const QString &xdgDataPrefix : lstGenericDataLocation) { + const QStringList lstAppDataLocation = QStandardPaths::standardLocations(QStandardPaths::AppDataLocation); + for (const QString &xdgDataPrefix : lstAppDataLocation) { if (QDir(xdgDataPrefix).exists()) { const QString prefix = QFileInfo(xdgDataPrefix).canonicalFilePath(); if (realPath.startsWith(prefix + QLatin1Char('/') + servicesDir, sensitivity)) { diff --git a/src/kconf_update/kconf_update.cpp b/src/kconf_update/kconf_update.cpp -index f6c7653..f9b83ac 100644 +index 2c48fa3..580d89c 100644 --- a/src/kconf_update/kconf_update.cpp +++ b/src/kconf_update/kconf_update.cpp @@ -145,7 +145,7 @@ KonfUpdate::KonfUpdate(QCommandLineParser *parser) m_bUseConfigInfo = false; if (parser->isSet(QStringLiteral("check"))) { m_bUseConfigInfo = true; - const QString file = QStandardPaths::locate(QStandardPaths::GenericDataLocation, "kconf_update/" + parser->value(QStringLiteral("check"))); + const QString file = QStandardPaths::locate(QStandardPaths::AppDataLocation, "kconf_update/" + parser->value(QStringLiteral("check"))); if (file.isEmpty()) { qWarning("File '%s' not found.", parser->value(QStringLiteral("check")).toLocal8Bit().data()); qCDebug(KCONF_UPDATE_LOG) << "File" << parser->value(QStringLiteral("check")) << "passed on command line not found"; @@ -190,7 +190,7 @@ QStringList KonfUpdate::findUpdateFiles(bool dirtyOnly) { QStringList result; - const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory); + const QStringList dirs = QStandardPaths::locateAll(QStandardPaths::AppDataLocation, QStringLiteral("kconf_update"), QStandardPaths::LocateDirectory); for (const QString &d : dirs) { const QDir dir(d); -@@ -751,7 +751,7 @@ void KonfUpdate::gotScript(const QString &_script) +@@ -754,7 +754,7 @@ void KonfUpdate::gotScript(const QString &_script) return; } -- QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QStringLiteral("kconf_update/") + script); +- QString path = QStandardPaths::locate(QStandardPaths::GenericDataLocation, QLatin1String("kconf_update/") + script); + QString path = QStandardPaths::locate(QStandardPaths::AppDataLocation, QStringLiteral("kconf_update/") + script); if (path.isEmpty()) { if (interpreter.isEmpty()) { path = CMAKE_INSTALL_PREFIX "/" LIB_INSTALL_DIR "/kconf_update_bin/" + script; diff --git a/3rdparty/ext_frameworks/kimageformats.diff b/3rdparty/ext_frameworks/kimageformats.diff index 3067194370..d37ca99936 100644 --- a/3rdparty/ext_frameworks/kimageformats.diff +++ b/3rdparty/ext_frameworks/kimageformats.diff @@ -1,14 +1,14 @@ diff --git a/src/imageformats/CMakeLists.txt b/src/imageformats/CMakeLists.txt -index 0db2ae8..e78b55d 100644 +index 8a53bba..4d2f553 100644 --- a/src/imageformats/CMakeLists.txt +++ b/src/imageformats/CMakeLists.txt -@@ -28,6 +28,9 @@ if(OpenEXR_FOUND) - add_library(kimg_exr MODULE exr.cpp) - target_link_libraries(kimg_exr Qt5::Gui OpenEXR::IlmImf) +@@ -47,6 +47,9 @@ if(OpenEXR_FOUND) + kimageformats_add_plugin(kimg_exr JSON "exr.json" SOURCES exr.cpp) + target_link_libraries(kimg_exr OpenEXR::IlmImf) kde_target_enable_exceptions(kimg_exr PRIVATE) + if (WIN32) + add_definitions(-DOPENEXR_DLL) + endif() - install(TARGETS kimg_exr DESTINATION ${KDE_INSTALL_QTPLUGINDIR}/imageformats/) install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/) + endif() diff --git a/3rdparty/ext_frameworks/kwindowsystem-x11.diff b/3rdparty/ext_frameworks/kwindowsystem-x11.diff index e7aa0a3399..929a4b8652 100644 --- a/3rdparty/ext_frameworks/kwindowsystem-x11.diff +++ b/3rdparty/ext_frameworks/kwindowsystem-x11.diff @@ -1,53 +1,53 @@ diff --git a/src/kstartupinfo.cpp b/src/kstartupinfo.cpp -index 76ab3be..014ab36 100644 +index 6cc7bbb..efc291b 100644 --- a/src/kstartupinfo.cpp +++ b/src/kstartupinfo.cpp -@@ -490,7 +490,7 @@ bool KStartupInfo::sendStartupX(Display *disp_P, const KStartupInfoId &id_P, +@@ -492,7 +492,7 @@ bool KStartupInfo::sendStartupX(Display *disp_P, const KStartupInfoId &id_P, #ifdef KSTARTUPINFO_ALL_DEBUG qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; #endif - return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); + return true; // KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); #else Q_UNUSED(disp_P) Q_UNUSED(data_P) -@@ -565,7 +565,7 @@ bool KStartupInfo::sendChangeX(Display *disp_P, const KStartupInfoId &id_P, +@@ -567,7 +567,7 @@ bool KStartupInfo::sendChangeX(Display *disp_P, const KStartupInfoId &id_P, #ifdef KSTARTUPINFO_ALL_DEBUG qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; #endif - return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); + return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); #else Q_UNUSED(disp_P) Q_UNUSED(data_P) -@@ -617,7 +617,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P) +@@ -619,7 +619,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P) #ifdef KSTARTUPINFO_ALL_DEBUG qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; #endif - return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); + return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); #else Q_UNUSED(disp_P) return true; -@@ -668,7 +668,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P, +@@ -670,7 +670,7 @@ bool KStartupInfo::sendFinishX(Display *disp_P, const KStartupInfoId &id_P, #ifdef KSTARTUPINFO_ALL_DEBUG qCDebug(LOG_KWINDOWSYSTEM) << "sending " << msg; #endif - return KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); + return true; //KXMessages::broadcastMessageX(disp_P, NET_STARTUP_MSG, msg); #else Q_UNUSED(disp_P) Q_UNUSED(id_P) diff --git a/src/platforms/xcb/kwindowsystem.cpp b/src/platforms/xcb/kwindowsystem.cpp -index 6789b7c..84b6d4c 100644 +index 7f9d30f..c6ed6f0 100644 --- a/src/platforms/xcb/kwindowsystem.cpp +++ b/src/platforms/xcb/kwindowsystem.cpp -@@ -234,7 +234,7 @@ bool NETEventFilter::nativeEventFilter(xcb_generic_event_t *ev) - int old_number_of_desktops = numberOfDesktops(); +@@ -236,7 +236,7 @@ bool NETEventFilter::nativeEventFilter(xcb_generic_event_t *ev) bool old_showing_desktop = showingDesktop(); - unsigned long m[ 5 ]; -- NETRootInfo::event(ev, m, 5); -+ //NETRootInfo::event(ev, m, 5); + NET::Properties props; + NET::Properties2 props2; +- NETRootInfo::event(ev, &props, &props2); ++ // NETRootInfo::event(ev, &props, &props2); - if ((m[ PROTOCOLS ] & CurrentDesktop) && currentDesktop() != old_current_desktop) { + if ((props & CurrentDesktop) && currentDesktop() != old_current_desktop) { emit s_q->currentDesktopChanged(currentDesktop());