fix build error about windowClass
(cherry picked from commit bb1e13bbf201dab65814d4315ea338d056b735e9)
This commit is contained in:
parent
a8aee68123
commit
c37944fec9
71
0003-fix-build-error-about-windowClass.patch
Normal file
71
0003-fix-build-error-about-windowClass.patch
Normal file
@ -0,0 +1,71 @@
|
|||||||
|
From 174735784266ba42ee5bcb1733ac3d8e4b307b04 Mon Sep 17 00:00:00 2001
|
||||||
|
From: peijiankang <peijiankang@kylinos.cn>
|
||||||
|
Date: Mon, 21 Aug 2023 09:59:49 +0800
|
||||||
|
Subject: [PATCH] fix build error about windowClass
|
||||||
|
|
||||||
|
---
|
||||||
|
decorations/decoratedclient.cpp | 5 +++++
|
||||||
|
decorations/decoratedclient.h | 1 +
|
||||||
|
kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp | 5 +++++
|
||||||
|
kcmkwin/kwindecoration/declarative-plugin/previewclient.h | 1 +
|
||||||
|
4 files changed, 12 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/decorations/decoratedclient.cpp b/decorations/decoratedclient.cpp
|
||||||
|
index c4c0c88..1ac88f4 100644
|
||||||
|
--- a/decorations/decoratedclient.cpp
|
||||||
|
+++ b/decorations/decoratedclient.cpp
|
||||||
|
@@ -263,6 +263,11 @@ int DecoratedClientImpl::width() const
|
||||||
|
return m_clientSize.width();
|
||||||
|
}
|
||||||
|
|
||||||
|
+QString DecoratedClientImpl::windowClass() const
|
||||||
|
+{
|
||||||
|
+ return QString();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int DecoratedClientImpl::height() const
|
||||||
|
{
|
||||||
|
return m_clientSize.height();
|
||||||
|
diff --git a/decorations/decoratedclient.h b/decorations/decoratedclient.h
|
||||||
|
index 49f8be5..7ba92d0 100644
|
||||||
|
--- a/decorations/decoratedclient.h
|
||||||
|
+++ b/decorations/decoratedclient.h
|
||||||
|
@@ -58,6 +58,7 @@ public:
|
||||||
|
QSize size() const override;
|
||||||
|
int width() const override;
|
||||||
|
WId windowId() const override;
|
||||||
|
+ QString windowClass() const override;
|
||||||
|
|
||||||
|
Qt::Edges adjacentScreenEdges() const override;
|
||||||
|
|
||||||
|
diff --git a/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp b/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
|
||||||
|
index ace02c8..08be8e3 100644
|
||||||
|
--- a/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
|
||||||
|
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewclient.cpp
|
||||||
|
@@ -133,6 +133,11 @@ int PreviewClient::width() const
|
||||||
|
return m_width;
|
||||||
|
}
|
||||||
|
|
||||||
|
+QString PreviewClient::windowClass() const
|
||||||
|
+{
|
||||||
|
+ return QString();
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
int PreviewClient::height() const
|
||||||
|
{
|
||||||
|
return m_height;
|
||||||
|
diff --git a/kcmkwin/kwindecoration/declarative-plugin/previewclient.h b/kcmkwin/kwindecoration/declarative-plugin/previewclient.h
|
||||||
|
index fe043db..1e35f00 100644
|
||||||
|
--- a/kcmkwin/kwindecoration/declarative-plugin/previewclient.h
|
||||||
|
+++ b/kcmkwin/kwindecoration/declarative-plugin/previewclient.h
|
||||||
|
@@ -87,6 +87,7 @@ public:
|
||||||
|
bool isShadeable() const override;
|
||||||
|
bool isShaded() const override;
|
||||||
|
bool providesContextHelp() const override;
|
||||||
|
+ QString windowClass() const override;
|
||||||
|
|
||||||
|
int width() const override;
|
||||||
|
int height() const override;
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: ukui-kwin
|
Name: ukui-kwin
|
||||||
Version: 1.0.5
|
Version: 1.0.5
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: KDE Window Manager for UKUI desktop environment
|
Summary: KDE Window Manager for UKUI desktop environment
|
||||||
License: GPL-2.0-or-later and LGPL-2.0-or-later
|
License: GPL-2.0-or-later and LGPL-2.0-or-later
|
||||||
URL: https://github.com/ukui/ukui-kwin
|
URL: https://github.com/ukui/ukui-kwin
|
||||||
@ -8,6 +8,7 @@ URL: https://github.com/ukui/ukui-kwin
|
|||||||
Source0: ukui-kwin-1.0.5.tar.gz
|
Source0: ukui-kwin-1.0.5.tar.gz
|
||||||
Patch01: 0001-fix-ukui-kwin-data-install-error.patch
|
Patch01: 0001-fix-ukui-kwin-data-install-error.patch
|
||||||
Patch02: 0002-fix-mate-terminal-theme.patch
|
Patch02: 0002-fix-mate-terminal-theme.patch
|
||||||
|
Patch03: 0003-fix-build-error-about-windowClass.patch
|
||||||
|
|
||||||
BuildRequires: cmake extra-cmake-modules
|
BuildRequires: cmake extra-cmake-modules
|
||||||
BuildRequires: kf5-kinit-devel kscreenlocker-devel libcap-devel libdrm-devel >= 2.4.62 mesa-libEGL-devel libepoxy-devel >= 1.2 fontconfig-devel freetype-devel libgbm-devel libICE-devel libinput-devel >= 1.15.5 kdecoration-devel
|
BuildRequires: kf5-kinit-devel kscreenlocker-devel libcap-devel libdrm-devel >= 2.4.62 mesa-libEGL-devel libepoxy-devel >= 1.2 fontconfig-devel freetype-devel libgbm-devel libICE-devel libinput-devel >= 1.15.5 kdecoration-devel
|
||||||
@ -204,6 +205,9 @@ cp COPYING* %{buildroot}%{_datadir}/licenses/ukui-kwin/
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Aug 21 2023 peijiankang<peijiankang@kylinos.cn> - 1.0.5-6
|
||||||
|
- add 0003-fix-build-error-about-windowClass.patch
|
||||||
|
|
||||||
* Thu Jun 01 2023 peijiankang<peijiankang@kylinos.cn> - 1.0.5-5
|
* Thu Jun 01 2023 peijiankang<peijiankang@kylinos.cn> - 1.0.5-5
|
||||||
- add Obsoletes ukui-kwin-libs
|
- add Obsoletes ukui-kwin-libs
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user