fix build error

dde-kwin.spec

@@ -1,12 +1,20 @@
 %global repo dde-kwin
+# not build kwin ext with kwin > 5.21.5
+%global kwin_ext 0
+%if !%{kwin_ext}
+%global debug_package %{nil}
+%endif
 
 Name:           dde-kwin
 Version:        5.1.0.27
-Release:        1
+Release:        2
 Summary:        KWin configuration for Deepin Desktop Environment
 License:        GPLv3+
 URL:            https://github.com/linuxdeepin/%{name}
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
+#Patch0:         fix-compile-error.patch
+Patch1:         fix-kwin-5-21.patch
+
 BuildRequires:  gcc-c++
 BuildRequires:  cmake
 BuildRequires:  kwin-devel
@@ -21,19 +29,22 @@ BuildRequires:  kf5-kservice-devel
 BuildRequires:  kf5-plasma-devel
 BuildRequires:  kdecoration-devel
 BuildRequires:  kf5-ktextwidgets-devel
+BuildRequires:  dtkgui-devel
+BuildRequires:  kf5-ki18n-devel
 
 BuildRequires:  cmake(KDecoration2)
 BuildRequires:  qt5-linguist
+%if %{kwin_ext}
 # for libQt5EdidSupport.a
 BuildRequires:  qt5-qtbase-static
 BuildRequires:  qt5-qtbase-private-devel
 BuildRequires:  qt5-qtdeclarative-devel
-BuildRequires:  dtkgui-devel
-BuildRequires:  kf5-ki18n-devel
 %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}}
 Requires:       dde-qt5integration%{?_isa}
-#Requires:       kwin%{?_isa} >= 5.17
+Requires:       kwin-x11%{?_isa} >= 5.21
-Requires:       kwin%{?_isa} >= 5.15
+%else
+Requires:       %{_bindir}/kwin_x11
+%endif
 # since F31
 Obsoletes:      deepin-wm <= 1.9.38
 Obsoletes:      deepin-wm-switcher <= 1.1.9
@@ -53,6 +64,7 @@ Requires:       kdecoration
 This package provides a kwin configuration that used as the new WM for Deepin
 Desktop Environment.
 
+%if %{kwin_ext}
 %package devel
 Summary:        Development package for %{name}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
@@ -65,9 +77,10 @@ Requires:       kf5-kglobalaccel-devel%{?_isa}
 
 %description devel
 Header files and libraries for %{sname}.
+%endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -p1
 sed -i 's:/lib:/%{_lib}:' plugins/kwin-xcb/lib/CMakeLists.txt
 sed -i 's:/usr/lib:%{_libdir}:' plugins/kwin-xcb/plugin/main.cpp
 sed -i 's:/usr/lib:%{_libexecdir}:' deepin-wm-dbus/deepinwmfaker.cpp
@@ -80,11 +93,13 @@ export PATH=%{_qt5_bindir}:$PATH
 %install
 %make_install INSTALL_ROOT=%{buildroot}
 chmod 755 %{buildroot}%{_bindir}/kwin_no_scale
+%if %{kwin_ext}
 install debian/dde-kwin.postinst  %{buildroot}%{_datadir}/kwin/scripts/
 chmod 755 %{buildroot}%{_datadir}/kwin/scripts/dde-kwin.postinst
- 
+
 %post
 bash -x %{_datadir}/kwin/scripts/dde-kwin.postinst
+%endif
 
 %ldconfig_scriptlets
 
@@ -92,8 +107,9 @@ bash -x %{_datadir}/kwin/scripts/dde-kwin.postinst
 %doc CHANGELOG.md
 %license LICENSE
 %{_sysconfdir}/xdg/*
-%{_bindir}/deepin-wm-dbus
 %{_bindir}/kwin_no_scale
+%if %{kwin_ext}
+%{_bindir}/deepin-wm-dbus
 %{_libdir}/libkwin-xcb.so.*
 %{_qt5_plugindir}/org.kde.kdecoration2/libdeepin-chameleon.so
 %{_qt5_plugindir}/platforms/lib%{name}-xcb.so
@@ -112,8 +128,12 @@ bash -x %{_datadir}/kwin/scripts/dde-kwin.postinst
 %{_libdir}/libkwin-xcb.so
 %{_libdir}/pkgconfig/%{name}.pc
 %{_includedir}/%{name}
+%endif
 
 %changelog
+* Fri Feb 25 2022 liweigang <liweiganga@uniontech.com> - 5.1.0.27-2
+- fix copmile error
+
 * Thu Jul 08 2021 weidong <weidong@uniontech.com> - 5.1.0.27-1
 - Update 5.1.0.27
 

fix-kwin-5-21.patch

@@ -0,0 +1,34 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2022-02-22 15:25:22.415856536 +0800
++++ b/CMakeLists.txt	2022-02-22 15:26:40.216912594 +0800
+@@ -73,7 +73,10 @@
+ endif()
+ 
+ add_subdirectory(configures)
+-add_subdirectory(plugins)
+-add_subdirectory(scripts)
+-add_subdirectory(deepin-wm-dbus)
+-add_subdirectory(tabbox)
++set(DDE_KWIN_SUPPORTED_VERSION "5.21.5")
++if (${KWIN_VERSION} STRLESS ${DDE_KWIN_SUPPORTED_VERSION} OR  ${KWIN_VERSION} STREQUAL ${DDE_KWIN_SUPPORTED_VERSION})
++    add_subdirectory(plugins)
++    add_subdirectory(scripts)
++    add_subdirectory(deepin-wm-dbus)
++    add_subdirectory(tabbox)
++endif()
+diff -Naur a/configures/kwin_no_scale.in b/configures/kwin_no_scale.in
+--- a/configures/kwin_no_scale.in	2022-02-22 15:25:30.179862133 +0800
++++ b/configures/kwin_no_scale.in	2022-02-22 15:27:08.271932807 +0800
+@@ -1,4 +1,12 @@
+ #!/bin/sh
++
++KWIN_VERSION=`kwin_x11 --version 2>/dev/null`
++DDE_KWIN_SUPPORTED_VERSION='kwin 5.21.5'
++if [ "$KWIN_VERSION" > "$DDE_KWIN_SUPPORTED_VERSION" ]; then
++    kwin_x11 $@
++    exit 0
++fi
++
+ if [ -n "$HOME" ];then
+     cp -n /etc/xdg/kglobalshortcutsrc $HOME/.config/kglobalshortcutsrc
+ fi