Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package applet-window-buttons for openSUSE:Factory checked in at 2022-02-13 00:15:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/applet-window-buttons (Old) and /work/SRC/openSUSE:Factory/.applet-window-buttons.new.1956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "applet-window-buttons" Sun Feb 13 00:15:26 2022 rev:14 rq:953931 version:0.11.1 Changes: -------- --- /work/SRC/openSUSE:Factory/applet-window-buttons/applet-window-buttons.changes 2022-01-07 12:47:03.103873393 +0100 +++ /work/SRC/openSUSE:Factory/.applet-window-buttons.new.1956/applet-window-buttons.changes 2022-02-13 00:15:45.188176979 +0100 @@ -1,0 +2,13 @@ +Sat Feb 12 16:43:41 UTC 2022 - Cor Blom <corne...@solcon.nl> + +- Update to 0.11.1: + * Add missing version + +------------------------------------------------------------------- +Sat Feb 12 11:50:06 UTC 2022 - Cor Blom <corne...@solcon.nl> + +- Uupdate to 0.11.0: + * support Plasma 5.24 way of discovering themes from theme engines + * hide when preserveemptyspace is selected + +------------------------------------------------------------------- Old: ---- applet-window-buttons-0.10.1.tar.gz New: ---- applet-window-buttons-0.11.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ applet-window-buttons.spec ++++++ --- /var/tmp/diff_new_pack.yE67WN/_old 2022-02-13 00:15:45.732178520 +0100 +++ /var/tmp/diff_new_pack.yE67WN/_new 2022-02-13 00:15:45.736178531 +0100 @@ -1,7 +1,7 @@ # # spec file for package applet-window-buttons # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,11 +16,11 @@ # -%define kf5_version 5.38 -%define qt5_version 5.9 +%define kf5_version 5.81 +%define qt5_version 5.15 Name: applet-window-buttons -Version: 0.10.1 +Version: 0.11.1 Release: 0 Summary: Plasma 5 applet to show window buttons in panels License: GPL-2.0-or-later @@ -39,8 +39,8 @@ BuildRequires: kxmlgui-devel >= %{kf5_version} BuildRequires: libSM-devel BuildRequires: plasma-framework-devel >= %{kf5_version} -BuildRequires: plasma5-workspace-devel >= 5.23 -BuildRequires: cmake(KDecoration2) >= 5.23 +BuildRequires: plasma5-workspace-devel >= 5.24 +BuildRequires: cmake(KDecoration2) >= 5.24 BuildRequires: cmake(Qt5Core) >= %{qt5_version} BuildRequires: cmake(Qt5DBus) >= %{qt5_version} BuildRequires: cmake(Qt5Quick) >= %{qt5_version} ++++++ applet-window-buttons-0.10.1.tar.gz -> applet-window-buttons-0.11.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/applet-window-buttons-0.10.1/CHANGELOG.md new/applet-window-buttons-0.11.1/CHANGELOG.md --- old/applet-window-buttons-0.10.1/CHANGELOG.md 2021-11-04 16:34:23.000000000 +0100 +++ new/applet-window-buttons-0.11.1/CHANGELOG.md 2022-02-12 17:39:01.000000000 +0100 @@ -1,5 +1,10 @@ ### CHANGELOG +#### Version 0.11.0 + +* support Plasma 5.24 way of discovering themes from theme engines +* hide when preserveemptyspace is selected + #### Version 0.10.1 * fix glitches with slide-in/out animations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/applet-window-buttons-0.10.1/CMakeLists.txt new/applet-window-buttons-0.11.1/CMakeLists.txt --- old/applet-window-buttons-0.10.1/CMakeLists.txt 2021-11-04 16:34:23.000000000 +0100 +++ new/applet-window-buttons-0.11.1/CMakeLists.txt 2022-02-12 17:39:01.000000000 +0100 @@ -2,13 +2,13 @@ cmake_minimum_required(VERSION 3.0 FATAL_ERROR) set(CMAKE_CXX_STANDARD 14) -set(VERSION 0.10.1) +set(VERSION 0.11.1) set(AUTHOR "Michail Vourlakos") set(EMAIL "mvourla...@gmail.com") -set(QT_MIN_VERSION "5.9.0") -set(KF5_MIN_VERSION "5.38.0") -set(KDECORATION2_MIN_VERSION "5.23.0") +set(QT_MIN_VERSION "5.15.0") +set(KF5_MIN_VERSION "5.81.0") +set(KDECORATION2_MIN_VERSION "5.24.0") set(KF5_LOCALE_PREFIX "") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/applet-window-buttons-0.10.1/libappletdecoration/decorationsmodel.cpp new/applet-window-buttons-0.11.1/libappletdecoration/decorationsmodel.cpp --- old/applet-window-buttons-0.10.1/libappletdecoration/decorationsmodel.cpp 2021-11-04 16:34:23.000000000 +0100 +++ new/applet-window-buttons-0.11.1/libappletdecoration/decorationsmodel.cpp 2022-02-12 17:39:01.000000000 +0100 @@ -23,8 +23,9 @@ #include "decorationsmodel.h" // KDecoration2 -#include <KDecoration2/DecorationSettings> #include <KDecoration2/Decoration> +#include <KDecoration2/DecorationSettings> +#include <KDecoration2/DecorationThemeProvider> // KDE #include <KDirWatch> #include <KPluginInfo> @@ -196,62 +197,36 @@ { beginResetModel(); m_plugins.clear(); - const auto plugins = KPluginTrader::self()->query(s_pluginName, s_pluginName); - + const auto plugins = KPluginMetaData::findPlugins(s_pluginName); for (const auto &info : plugins) { - KPluginLoader loader(info.libraryPath()); - KPluginFactory *factory = loader.factory(); + QScopedPointer<KDecoration2::DecorationThemeProvider> themeFinder( + KPluginFactory::instantiatePlugin<KDecoration2::DecorationThemeProvider>(info).plugin); - if (!factory) { - continue; - } - - auto metadata = loader.metaData().value(QStringLiteral("MetaData")).toObject().value(s_pluginName); + const auto decoSettingsMap = info.rawData().value("org.kde.kdecoration2").toObject().toVariantMap(); bool config = false; - - if (!metadata.isUndefined()) { - const auto decoSettingsMap = metadata.toObject().toVariantMap(); + if (themeFinder) { const QString &kns = findKNewStuff(decoSettingsMap); - - if (!kns.isEmpty()) { - m_knsProvides.insert(kns, info.name().isEmpty() ? info.pluginName() : info.name()); + if (!kns.isEmpty() && !m_knsProvides.contains(kns)) { + m_knsProvides.insert(kns, info.name().isEmpty() ? info.pluginId() : info.name()); } - if (isThemeEngine(decoSettingsMap)) { const QString keyword = themeListKeyword(decoSettingsMap); - if (keyword.isNull()) { // We cannot list the themes continue; } - - QScopedPointer<QObject> themeFinder(factory->create<QObject>(keyword)); - - if (themeFinder.isNull()) { - continue; - } - - QVariant themes = themeFinder->property("themes"); - - if (!themes.isValid()) { - continue; - } - - const auto themesMap = themes.toMap(); - - for (auto it = themesMap.begin(); it != themesMap.end(); ++it) { + const auto themesList = themeFinder->themes(); + for (const KDecoration2::DecorationThemeMetaData &data : themesList) { Data d; - d.pluginName = info.pluginName(); - d.themeName = it.value().toString(); - d.visibleName = it.key(); + d.pluginName = info.pluginId(); + d.themeName = data.themeName(); + d.visibleName = data.visibleName(); if (d.pluginName == s_auroraePlugin && d.themeName.startsWith(s_auroraeSvgTheme)) { d.isAuroraeTheme = true; - QMetaObject::invokeMethod(themeFinder.data(), "hasConfiguration", - Q_RETURN_ARG(bool, d.configuration), - Q_ARG(QString, d.themeName)); - m_plugins.emplace_back(std::move(d)); } + + m_plugins.emplace_back(std::move(d)); } // it's a theme engine, we don't want to show this entry @@ -260,15 +235,13 @@ config = isConfigureable(decoSettingsMap); } - Data data; - data.pluginName = info.pluginName(); - data.visibleName = info.name().isEmpty() ? info.pluginName() : info.name(); + data.pluginName = info.pluginId(); + data.visibleName = info.name().isEmpty() ? info.pluginId() : info.name(); data.configuration = config; m_plugins.emplace_back(std::move(data)); } - endResetModel(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/applet-window-buttons-0.10.1/package/contents/ui/main.qml new/applet-window-buttons-0.11.1/package/contents/ui/main.qml --- old/applet-window-buttons-0.10.1/package/contents/ui/main.qml 2021-11-04 16:34:23.000000000 +0100 +++ new/applet-window-buttons-0.11.1/package/contents/ui/main.qml 2022-02-12 17:39:01.000000000 +0100 @@ -403,16 +403,19 @@ root.height - 2 * thickPadding : root.width - 2 * thickPadding - opacity: mustHide && !inEditMode && (plasmoid.status === PlasmaCore.Types.HiddenStatus) ? 0 : 1 + opacity: mustHide + && !inEditMode + && (!root.slideAnimationEnabled /*when buttons are not sliding out*/ + || (root.slideAnimationEnabled && plasmoid.status === PlasmaCore.Types.HiddenStatus/*wait for slide-out animation*/)) ? 0 : 1 visible: opacity === 0 ? false : true - Behavior on opacity { + /* Behavior on opacity { enabled: isEmptySpaceEnabled NumberAnimation { duration: 250 easing.type: Easing.InCubic } - } + }*/ Repeater { id: buttonsRepeater diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/applet-window-buttons-0.10.1/package/metadata.desktop new/applet-window-buttons-0.11.1/package/metadata.desktop --- old/applet-window-buttons-0.10.1/package/metadata.desktop 2021-11-04 16:34:23.000000000 +0100 +++ new/applet-window-buttons-0.11.1/package/metadata.desktop 2022-02-12 17:39:01.000000000 +0100 @@ -15,7 +15,7 @@ X-KDE-PluginInfo-Email=mvourla...@gmail.com X-KDE-PluginInfo-License=GPLv2 X-KDE-PluginInfo-Name=org.kde.windowbuttons -X-KDE-PluginInfo-Version=0.10.1 +X-KDE-PluginInfo-Version=0.11.1 X-KDE-PluginInfo-Website=https://github.com/psifidotos/applet-window-buttons X-KDE-ServiceTypes=Plasma/Applet