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 2021-02-25 18:27:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/applet-window-buttons (Old)
and /work/SRC/openSUSE:Factory/.applet-window-buttons.new.2378 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "applet-window-buttons"
Thu Feb 25 18:27:57 2021 rev:8 rq:874782 version:0.8.1
Changes:
--------
---
/work/SRC/openSUSE:Factory/applet-window-buttons/applet-window-buttons.changes
2020-02-14 16:38:25.347620783 +0100
+++
/work/SRC/openSUSE:Factory/.applet-window-buttons.new.2378/applet-window-buttons.changes
2021-02-25 18:27:58.322201318 +0100
@@ -1,0 +2,6 @@
+Wed Feb 24 09:12:45 UTC 2021 - Cor Blom <[email protected]>
+
+- Add fix-build-plasma-5.21.patch to fix compilation with Plasma
+ 5.21
+
+-------------------------------------------------------------------
New:
----
fix-build-plasma-5.21.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ applet-window-buttons.spec ++++++
--- /var/tmp/diff_new_pack.GAVuLn/_old 2021-02-25 18:27:58.974201741 +0100
+++ /var/tmp/diff_new_pack.GAVuLn/_new 2021-02-25 18:27:58.978201745 +0100
@@ -1,7 +1,7 @@
#
# spec file for package applet-window-buttons
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -27,6 +27,8 @@
Group: System/GUI/KDE
URL: https://github.com/psifidotos/applet-window-buttons
Source:
https://github.com/psifidotos/applet-window-buttons/archive/%{version}/%{name}-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM fix compilation with Plasma 5.21
+Patch0: fix-build-plasma-5.21.patch
BuildRequires: extra-cmake-modules
BuildRequires: fdupes
BuildRequires: kconfig-devel >= %{kf5_version}
@@ -54,7 +56,7 @@
support Plasma panels.
%prep
-%setup -q
+%autosetup -p1
%build
%cmake_kf5 -d build
++++++ fix-build-plasma-5.21.patch ++++++
>From dc5ed862fa3cb943f9c0d561c864ff461156a19e Mon Sep 17 00:00:00 2001
From: Michail Vourlakos <[email protected]>
Date: Fri, 22 Jan 2021 17:25:10 +0200
Subject: [PATCH] fix #113,#114 compilation error with plasma 5.21
--update preview client api to meet plasma 5.21 changes
---
libappletdecoration/previewclient.cpp | 57 ++++++++++++++++-----------
libappletdecoration/previewclient.h | 7 +++-
2 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/libappletdecoration/previewclient.cpp
b/libappletdecoration/previewclient.cpp
index 0b41c29..2cf184b 100644
--- a/libappletdecoration/previewclient.cpp
+++ b/libappletdecoration/previewclient.cpp
@@ -38,7 +38,7 @@ PreviewClient::PreviewClient(KDecoration2::DecoratedClient
*c, KDecoration2::Dec
, ApplicationMenuEnabledDecoratedClientPrivate(c, decoration)
, m_icon(QIcon::fromTheme(QStringLiteral("start-here-kde")))
, m_iconName(m_icon.name())
- // , m_palette(new
KWin::Decoration::DecorationPalette(QStringLiteral("kdeglobals")))
+ // , m_palette(new
KWin::Decoration::DecorationPalette(QStringLiteral("kdeglobals")))
, m_active(true)
, m_closeable(true)
, m_keepBelow(false)
@@ -71,40 +71,40 @@ PreviewClient::PreviewClient(KDecoration2::DecoratedClient
*c, KDecoration2::Dec
connect(this, &PreviewClient::maximizedVerticallyChanged, c,
&KDecoration2::DecoratedClient::maximizedVerticallyChanged);
connect(this, &PreviewClient::maximizedHorizontallyChanged, c,
&KDecoration2::DecoratedClient::maximizedHorizontallyChanged);
connect(this, &PreviewClient::minimizableChanged, c,
&KDecoration2::DecoratedClient::minimizeableChanged);
-// connect(this, &PreviewClient::modalChanged, c,
&DecoratedClient::modalChanged);
+ // connect(this, &PreviewClient::modalChanged, c,
&DecoratedClient::modalChanged);
connect(this, &PreviewClient::movableChanged, c,
&KDecoration2::DecoratedClient::moveableChanged);
connect(this, &PreviewClient::onAllDesktopsChanged, c,
&KDecoration2::DecoratedClient::onAllDesktopsChanged);
connect(this, &PreviewClient::resizableChanged, c,
&KDecoration2::DecoratedClient::resizeableChanged);
connect(this, &PreviewClient::shadeableChanged, c,
&KDecoration2::DecoratedClient::shadeableChanged);
connect(this, &PreviewClient::shadedChanged, c,
&KDecoration2::DecoratedClient::shadedChanged);
connect(this, &PreviewClient::providesContextHelpChanged, c,
&KDecoration2::DecoratedClient::providesContextHelpChanged);
-// connect(this, &PreviewClient::onAllDesktopsChanged, c,
&KDecoration2::DecoratedClient::onAllDesktopsChanged);
+ // connect(this, &PreviewClient::onAllDesktopsChanged, c,
&KDecoration2::DecoratedClient::onAllDesktopsChanged);
connect(this, &PreviewClient::widthChanged, c,
&KDecoration2::DecoratedClient::widthChanged);
connect(this, &PreviewClient::heightChanged, c,
&KDecoration2::DecoratedClient::heightChanged);
connect(this, &PreviewClient::iconChanged, c,
&KDecoration2::DecoratedClient::iconChanged);
connect(this, &PreviewClient::paletteChanged, c,
&KDecoration2::DecoratedClient::paletteChanged);
-// connect(this, &PreviewClient::, c, &DecoratedClient::);
+ // connect(this, &PreviewClient::, c, &DecoratedClient::);
connect(this, &PreviewClient::maximizedVerticallyChanged, this,
- [this]() {
+ [this]() {
emit maximizedChanged(isMaximized());
}
- );
+ );
connect(this, &PreviewClient::maximizedHorizontallyChanged, this,
- [this]() {
+ [this]() {
emit maximizedChanged(isMaximized());
}
- );
+ );
connect(this, &PreviewClient::iconNameChanged, this,
- [this]() {
+ [this]() {
m_icon = QIcon::fromTheme(m_iconName);
emit iconChanged(m_icon);
}
- );
+ );
connect(this, &PreviewClient::desktopChanged, this,
- [this](int) {
+ [this](int) {
emit onAllDesktopsChanged(isOnAllDesktops());
}
- );
+ );
/* connect(m_palette, &KWin::Decoration::DecorationPalette::changed,
[this]() {
emit paletteChanged(m_palette->palette());
});*/
@@ -404,6 +404,20 @@ QSize PreviewClient::size() const
}
#endif
+
+#if KDECORATION2_VERSION_MINOR <= 20
+void PreviewClient::requestShowWindowMenu()
+{
+ emit showWindowMenuRequested();
+}
+#else
+void PreviewClient::requestShowWindowMenu(const QRect &rect)
+{
+ emit showWindowMenuRequested();
+}
+#endif
+
+
void PreviewClient::requestClose()
{
emit closeRequested();
@@ -442,11 +456,6 @@ void PreviewClient::requestToggleKeepBelow()
setKeepBelow(!isKeepBelow());
}
-void PreviewClient::requestShowWindowMenu()
-{
- emit showWindowMenuRequested();
-}
-
void PreviewClient::requestShowApplicationMenu(const QRect &rect, int actionId)
{
Q_UNUSED(rect);
@@ -470,13 +479,13 @@ void PreviewClient::requestToggleShade()
#define SETTER(type, name, variable) \
void PreviewClient::name(type variable) \
- { \
- if (m_##variable == variable) { \
- return; \
- } \
- m_##variable = variable; \
- emit variable##Changed(m_##variable); \
- }
+{ \
+ if (m_##variable == variable) { \
+ return; \
+} \
+ m_##variable = variable; \
+ emit variable##Changed(m_##variable); \
+}
#define SETTER2(name, variable) SETTER(bool, name, variable)
diff --git a/libappletdecoration/previewclient.h
b/libappletdecoration/previewclient.h
index 3bfa106..c479acc 100644
--- a/libappletdecoration/previewclient.h
+++ b/libappletdecoration/previewclient.h
@@ -111,6 +111,12 @@ class PreviewClient : public QObject, public
KDecoration2::ApplicationMenuEnable
QSize size() const override;
#endif
+#if KDECORATION2_VERSION_MINOR <= 20
+ void requestShowWindowMenu() override;
+#else
+ void requestShowWindowMenu(const QRect &rect) override;
+#endif
+
void requestClose() override;
void requestContextHelp() override;
void requestToggleMaximization(Qt::MouseButtons buttons) override;
@@ -118,7 +124,6 @@ class PreviewClient : public QObject, public
KDecoration2::ApplicationMenuEnable
void requestToggleKeepAbove() override;
void requestToggleKeepBelow() override;
void requestToggleShade() override;
- void requestShowWindowMenu() override;
void requestShowApplicationMenu(const QRect &rect, int actionId) override;
void requestToggleOnAllDesktops() override;
