Hello community, here is the log from the commit of package kwayland-integration for openSUSE:Factory checked in at 2020-02-10 21:51:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwayland-integration (Old) and /work/SRC/openSUSE:Factory/.kwayland-integration.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland-integration" Mon Feb 10 21:51:30 2020 rev:78 rq:772243 version:5.18.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwayland-integration/kwayland-integration.changes 2020-01-11 14:39:31.141172416 +0100 +++ /work/SRC/openSUSE:Factory/.kwayland-integration.new.26092/kwayland-integration.changes 2020-02-10 21:51:35.178130061 +0100 @@ -1,0 +2,33 @@ +Thu Feb 6 15:10:04 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.18.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.0.php +- No code changes since 5.17.90 + +------------------------------------------------------------------- +Thu Jan 23 11:20:24 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Replace %make_jobs with %cmake_build + +------------------------------------------------------------------- +Thu Jan 16 14:04:18 UTC 2020 - Fabian Vogt <fab...@ritter-vogt.de> + +- Update to 5.17.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.17.90.php +- Changes since 5.17.5: + * [windowsystem] Fix compilation with no-deprecated build of KWindowSystem + * kwayland-integration: fix compilation with no-deprecated build of kwindowsystem + * Remove duplicated check for StaysOnTop, same value as KeepAbove. + * Port deprecated enum + * It's already in ecm + * Add KDEClangFormat cmake support + * Don't commit the wl_surface from outside Qt code + * [KWindowSystem] in icon() return realistic icon size + * We depend against 5.62 now + * Remove support for KWin's QPA plugin for KWindowSystem + +------------------------------------------------------------------- Old: ---- kwayland-integration-5.17.5.tar.xz kwayland-integration-5.17.5.tar.xz.sig New: ---- kwayland-integration-5.18.0.tar.xz kwayland-integration-5.18.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland-integration.spec ++++++ --- /var/tmp/diff_new_pack.NTu89M/_old 2020-02-10 21:51:35.822130418 +0100 +++ /var/tmp/diff_new_pack.NTu89M/_new 2020-02-10 21:51:35.822130418 +0100 @@ -18,7 +18,7 @@ %bcond_without lang Name: kwayland-integration -Version: 5.17.5 +Version: 5.18.0 Release: 0 # Full Plasma 5 version (e.g. 5.8.95) %{!?_plasma5_bugfix: %define _plasma5_bugfix %{version}} @@ -28,9 +28,9 @@ 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 @@ -51,7 +51,7 @@ %build %cmake_kf5 -d build - %make_jobs + %cmake_build %install %kf5_makeinstall -C build ++++++ kwayland-integration-5.17.5.tar.xz -> kwayland-integration-5.18.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-integration-5.17.5/.gitignore new/kwayland-integration-5.18.0/.gitignore --- old/kwayland-integration-5.17.5/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/kwayland-integration-5.18.0/.gitignore 2020-02-06 14:14:17.000000000 +0100 @@ -0,0 +1,21 @@ +# Ignore the following files +*~ +*.[oa] +*.diff +*.kate-swp +*.kdev4 +.kdev_include_paths +*.kdevelop.pcs +*.moc +*.moc.cpp +*.orig +*.user +.*.swp +.swp.* +Doxyfile +Makefile +avail +random_seed +/build*/ +CMakeLists.txt.user* +*.unc-backup* diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-integration-5.17.5/CMakeLists.txt new/kwayland-integration-5.18.0/CMakeLists.txt --- old/kwayland-integration-5.17.5/CMakeLists.txt 2020-01-07 16:32:33.000000000 +0100 +++ new/kwayland-integration-5.18.0/CMakeLists.txt 2020-02-06 14:14:17.000000000 +0100 @@ -1,10 +1,10 @@ project(kwayland-integration) -set(PROJECT_VERSION "5.17.5") +set(PROJECT_VERSION "5.18.0") set(PROJECT_VERSION_MAJOR 5) cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) set(QT_MIN_VERSION "5.12.0") -set(KF5_MIN_VERSION "5.62.0") +set(KF5_MIN_VERSION "5.64.0") find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) @@ -23,6 +23,7 @@ include(KDECMakeSettings) include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) +include(KDEClangFormat) # required frameworks find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS @@ -32,7 +33,6 @@ ) find_package(KF5Wayland CONFIG REQUIRED) -add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT) #add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000) add_subdirectory(src) @@ -40,4 +40,8 @@ add_subdirectory(autotests) endif() +# add clang-format target for all our real source files +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) +kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-integration-5.17.5/src/windowsystem/CMakeLists.txt new/kwayland-integration-5.18.0/src/windowsystem/CMakeLists.txt --- old/kwayland-integration-5.17.5/src/windowsystem/CMakeLists.txt 2020-01-07 16:32:33.000000000 +0100 +++ new/kwayland-integration-5.18.0/src/windowsystem/CMakeLists.txt 2020-02-06 14:14:17.000000000 +0100 @@ -23,9 +23,5 @@ ${PLUGIN_INSTALL_DIR}/kf5/org.kde.kwindowsystem.platforms/ ) -if (${ECM_VERSION} STRGREATER "5.58.0") - install(FILES kwindowsystem.kwayland.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) -else() - install(FILES kwindowsystem.kwayland.categories DESTINATION ${KDE_INSTALL_CONFDIR}) -endif() +install(FILES kwindowsystem.kwayland.categories DESTINATION ${KDE_INSTALL_LOGGINGCATEGORIESDIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-integration-5.17.5/src/windowsystem/wayland.json new/kwayland-integration-5.18.0/src/windowsystem/wayland.json --- old/kwayland-integration-5.17.5/src/windowsystem/wayland.json 2020-01-07 16:32:33.000000000 +0100 +++ new/kwayland-integration-5.18.0/src/windowsystem/wayland.json 2020-02-06 14:14:17.000000000 +0100 @@ -1,3 +1,3 @@ { - "platforms": ["wayland", "wayland-egl", "wayland-org.kde.kwin.qpa"] + "platforms": ["wayland", "wayland-egl"] } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-integration-5.17.5/src/windowsystem/windoweffects.cpp new/kwayland-integration-5.18.0/src/windowsystem/windoweffects.cpp --- old/kwayland-integration-5.17.5/src/windowsystem/windoweffects.cpp 2020-01-07 16:32:33.000000000 +0100 +++ new/kwayland-integration-5.18.0/src/windowsystem/windoweffects.cpp 2020-02-06 14:14:17.000000000 +0100 @@ -159,7 +159,6 @@ } else { WaylandIntegration::self()->waylandSlideManager()->removeSlide(surface); } - surface->commit(KWayland::Client::Surface::CommitFlag::None); WaylandIntegration::self()->waylandConnection()->flush(); } @@ -229,7 +228,6 @@ } else { WaylandIntegration::self()->waylandBlurManager()->removeBlur(surface); } - surface->commit(KWayland::Client::Surface::CommitFlag::None); WaylandIntegration::self()->waylandConnection()->flush(); } @@ -272,15 +270,14 @@ } else { WaylandIntegration::self()->waylandContrastManager()->removeContrast(surface); } - surface->commit(KWayland::Client::Surface::CommitFlag::None); WaylandIntegration::self()->waylandConnection()->flush(); } } +#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 67) void WindowEffects::markAsDashboard(WId window) { Q_UNUSED(window) } - - +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-integration-5.17.5/src/windowsystem/windoweffects.h new/kwayland-integration-5.18.0/src/windowsystem/windoweffects.h --- old/kwayland-integration-5.17.5/src/windowsystem/windoweffects.h 2020-01-07 16:32:33.000000000 +0100 +++ new/kwayland-integration-5.18.0/src/windowsystem/windoweffects.h 2020-02-06 14:14:17.000000000 +0100 @@ -62,7 +62,9 @@ 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; void enableBackgroundContrast(QWindow *window, bool enable = true, qreal contrast = 1, qreal intensity = 1, qreal saturation = 1, const QRegion ®ion = QRegion()); +#if KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(5, 67) void markAsDashboard(WId window) override; +#endif private: QHash<QWindow *, QMetaObject::Connection> m_windowWatchers; QHash<QWindow *, QRegion> m_blurRegions; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-integration-5.17.5/src/windowsystem/windowsystem.cpp new/kwayland-integration-5.18.0/src/windowsystem/windowsystem.cpp --- old/kwayland-integration-5.17.5/src/windowsystem/windowsystem.cpp 2020-01-07 16:32:33.000000000 +0100 +++ new/kwayland-integration-5.18.0/src/windowsystem/windowsystem.cpp 2020-02-06 14:14:17.000000000 +0100 @@ -164,10 +164,32 @@ QPixmap WindowSystem::icon(WId win, int width, int height, bool scale, int flags) { - 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)) { - return w->icon().pixmap(width, height); + QPixmap pixmap = w->icon().pixmap(iconWidth, iconWidth); + if (scale) { + return pixmap.scaled(width, height, Qt::IgnoreAspectRatio, Qt::SmoothTransformation); + } + return pixmap; } return QPixmap(); } @@ -351,6 +373,9 @@ if (state & NET::KeepAbove) { qCDebug(KWAYLAND_KWS) << "This plugin does not support changing KeepAbove window state"; } + if (state & NET::KeepAbove) { + qCDebug(KWAYLAND_KWS) << "This plugin does not support changing StaysOnTop window state"; + } if (state & NET::SkipPager) { qCDebug(KWAYLAND_KWS) << "This plugin does not support changing SkipPager window state"; } @@ -409,6 +434,9 @@ if (state & NET::KeepAbove) { qCDebug(KWAYLAND_KWS) << "This plugin does not support changing KeepAbove window state"; } + if (state & NET::KeepAbove) { + qCDebug(KWAYLAND_KWS) << "This plugin does not support changing StaysOnTop window state"; + } if (state & NET::SkipPager) { qCDebug(KWAYLAND_KWS) << "This plugin does not support changing SkipPager window state"; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-integration-5.17.5/src/windowsystem/windowsystem.h new/kwayland-integration-5.18.0/src/windowsystem/windowsystem.h --- old/kwayland-integration-5.17.5/src/windowsystem/windowsystem.h 2020-01-07 16:32:33.000000000 +0100 +++ new/kwayland-integration-5.18.0/src/windowsystem/windowsystem.h 2020-02-06 14:14:17.000000000 +0100 @@ -34,15 +34,6 @@ } } -// Compat with KF < 5.64 -#ifndef KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE -#ifndef KWINDOWSYSTEM_NO_DEPRECATED -#define KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(x, y) 1 -#else -#define KWINDOWSYSTEM_BUILD_DEPRECATED_SINCE(x, y) 0 -#endif -#endif - class WindowSystem : public QObject, public KWindowSystemPrivate { Q_OBJECT