!38 adapt to the new CMake macros to fix build failure

From: @hua_yadong 
Reviewed-by: @dou33 
Signed-off-by: @dou33

0002-fix-mate-terminal-theme.patch

@@ -0,0 +1,43 @@
+From b1400c71a92d0893103d3a1a616976fac0787117 Mon Sep 17 00:00:00 2001
+From: peijiankang <peijiankang@kylinos.cn>
+Date: Thu, 9 Mar 2023 14:10:33 +0800
+Subject: [PATCH] fix mate-terminal theme
+
+---
+ decorations/decorationbridge.cpp | 19 +++++++++++++++++++
+ 1 files changed, 19 insertions(+)
+
+diff --git a/decorations/decorationbridge.cpp b/decorations/decorationbridge.cpp
+index 10e766c..a19fe8a 100644
+--- a/decorations/decorationbridge.cpp
++++ b/decorations/decorationbridge.cpp
+@@ -156,7 +156,26 @@ void DecorationBridge::init()
+             m_dpi = 30;     //设置一个限度，不允许dpi小于30
+         }
+     }
++    QGSettings* pThemeSettings = new QGSettings("org.ukui.style", "/org/ukui/style/", this);
+ 
++    QString strTheme;
++    if (true == pThemeSettings->keys().contains("styleName")){
++	    strTheme = pThemeSettings->get("style-name").toString();
++	    qDebug() << "DecorationBridge::init theme:" << strTheme;
++    }
++
++    if("ukui-light" == strTheme)
++    {
++	    m_themeId = 0;
++    }
++    else if("ukui-dark" == strTheme)
++    {
++	    m_themeId = 1;
++    }
++    else    //默认ukui-default
++    {
++	    m_themeId = 0;
++    }
+ 
+     const QFont font = QFontDatabase::systemFont(QFontDatabase::TitleFont);
+     m_nFont = font.pointSize();
+-- 
+2.39.1
+

0003-fix-build-error-about-windowClass.patch

@@ -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
+

ukui-kwin.spec

@@ -1,12 +1,14 @@
 Name:           ukui-kwin
 Version:        1.0.5
-Release:        3
+Release:        8
 Summary:        KDE Window Manager for UKUI desktop environment
 License:        GPL-2.0-or-later and LGPL-2.0-or-later
 URL:            https://github.com/ukui/ukui-kwin     
 
 Source0:        ukui-kwin-1.0.5.tar.gz
 Patch01:        0001-fix-ukui-kwin-data-install-error.patch
+Patch02:        0002-fix-mate-terminal-theme.patch
+Patch03:        0003-fix-build-error-about-windowClass.patch
 
 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
@@ -14,7 +16,7 @@ BuildRequires:  kf5-kactivities-devel  kf5-kcompletion-devel  kf5-kconfig-devel
 BuildRequires:  qt5-qtsensors-devel qt5-qtx11extras-devel 
 BuildRequires:  libSM-devel systemd-devel wayland-devel  >= 1.2 
 BuildRequires:  libX11-devel libxcb-devel xcb-util-cursor xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-devel libXcursor-devel libXi-devel libxkbcommon-devel >= 0.7.0 pkg-config
-BuildRequires:  qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtdeclarative-devel  qt5-qtscript-devel  qt5-qttools-devel gsettings-qt-devel 
+BuildRequires:  qt5-qtbase-devel qt5-qtbase-private-devel qt5-qtdeclarative-devel  qt5-qtscript-devel  qt5-qttools-static gsettings-qt-devel 
 BuildRequires:  kwin-devel libXtst-devel
 #compile need
 BuildRequires:  kf5-kirigami2-devel plasma-breeze-devel xcb-util-cursor-devel xcb-util-wm-devel xcb-util-image-devel xcb-util-keysyms-devel qt5-qtbase-static kf5-kguiaddons-devel
@@ -38,6 +40,7 @@ Requires:       xorg-x11-server-Xwayland
 %package -n ukui-kwin-common
 Summary:        UKUI window manager, common files
 Requires:       ukui-kwin-data kf5-kglobalaccel libukui-kwineffects12 kf5-kirigami2 kf5-kdeclarative qt5-qtmultimedia 
+Obsoletes:      ukui-kwin-libs
 Recommends:     qt5-qtvirtualkeyboard
 %description -n ukui-kwin-common
 %{summary}.
@@ -95,17 +98,14 @@ Summary:        UKUI window manager effects library
 %autosetup -n %{name}-%{version} -p1
 
 %build
-mkdir %{_target_platform}
-pushd %{_target_platform}
 %{cmake_kf5} .. \
    -DBUILD_TESTING:BOOL=ON
-popd
-
-%make_build -C %{_target_platform} -j4
+%{cmake_build}
 
 
 %install
-make install/fast DESTDIR=%{buildroot} -C %{_target_platform}
+%{cmake_install}
+
 
 ln -s ukui-kwin_x11 %{buildroot}%{_bindir}/ukui-kwin
 mkdir -p %{buildroot}%{_datadir}/licenses/ukui-kwin
@@ -202,6 +202,21 @@ cp  COPYING* %{buildroot}%{_datadir}/licenses/ukui-kwin/
 
 
 %changelog
+* Wed Nov 20 2024 huayadong<huayadong@kylinos.cn> - 1.0.5-8
+- adapt to the new CMake macros to fix build failure
+
+* Tue Aug 29 2023 peijiankang<peijiankang@kylinos.cn> - 1.0.5-7
+- update qt5-qttools-devel to qt5-qttools-static
+
+* 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
+- add Obsoletes ukui-kwin-libs
+
+* Thu Mar 09 2023 peijiankang<peijiankang@kylinos.cn> - 1.0.5-4
+- fix mate-terminal theme
+
 * Thu Feb 16 2023 peijiankang<peijiankang@kylinos.cn> - 1.0.5-3
 - fix ukui-kwin-data install error