From 4371137c8e215229d1c930c189edda8cee501da6 Mon Sep 17 00:00:00 2001 From: pei-jiankang Date: Fri, 29 Jul 2022 02:33:39 +0800 Subject: [PATCH] modify complie error of kde5.95 --- 0003-modify-complie-error-of-kde5.95.patch | 47 ++++++++++++++++++++++ ukui-kwin.spec | 6 ++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 0003-modify-complie-error-of-kde5.95.patch diff --git a/0003-modify-complie-error-of-kde5.95.patch b/0003-modify-complie-error-of-kde5.95.patch new file mode 100644 index 0000000..69ed9d3 --- /dev/null +++ b/0003-modify-complie-error-of-kde5.95.patch @@ -0,0 +1,47 @@ +From af9bf0a88fd878f4f31e6289e7dcdd28b5a554d9 Mon Sep 17 00:00:00 2001 +From: pei-jiankang +Date: Fri, 29 Jul 2022 02:30:32 +0800 +Subject: [PATCH] modify complie error of kde5.95 + +--- + CMakeLists.txt | 2 +- + kcmkwin/kwindesktop/CMakeLists.txt | 2 +- + kcmkwin/kwineffects/CMakeLists.txt | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 152b6fe..b3fb1a4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -299,7 +299,7 @@ set_package_properties(Libcap PROPERTIES + ) + set(HAVE_LIBCAP ${Libcap_FOUND}) + +-include(ECMQMLModules) ++include(ECMFindQmlModule) + ecm_find_qmlmodule(QtQuick 2.3) + ecm_find_qmlmodule(QtQuick.Controls 1.2) + ecm_find_qmlmodule(QtQuick.Layouts 1.3) +diff --git a/kcmkwin/kwindesktop/CMakeLists.txt b/kcmkwin/kwindesktop/CMakeLists.txt +index 174ebbe..6264c8b 100644 +--- a/kcmkwin/kwindesktop/CMakeLists.txt ++++ b/kcmkwin/kwindesktop/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include(ECMQMLModules) ++include(ECMFindQmlModule) + ecm_find_qmlmodule(org.kde.plasma.core 2.0) + + # KI18N Translation Domain for this library. +diff --git a/kcmkwin/kwineffects/CMakeLists.txt b/kcmkwin/kwineffects/CMakeLists.txt +index cb0d13a..b3de5ec 100644 +--- a/kcmkwin/kwineffects/CMakeLists.txt ++++ b/kcmkwin/kwineffects/CMakeLists.txt +@@ -1,4 +1,4 @@ +-include(ECMQMLModules) ++include(ECMFindQmlModule) + ecm_find_qmlmodule(org.kde.plasma.core 2.0) + + # KI18N Translation Domain for this library. +-- +2.33.0 + diff --git a/ukui-kwin.spec b/ukui-kwin.spec index 7bc6254..1f347c1 100644 --- a/ukui-kwin.spec +++ b/ukui-kwin.spec @@ -1,6 +1,6 @@ Name: ukui-kwin Version: 1.0.4 -Release: 4 +Release: 5 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 @@ -15,6 +15,7 @@ URL: https://github.com/ukui/ukui-kwin Source0: ukui-kwin_1.0.4.orig.tar.gz Patch00: 0001-modify-ukui-kwin-complie-error.patch Patch01: 0002-update-ukui-kwin.desktop.patch +Patch02: 0003-modify-complie-error-of-kde5.95.patch BuildRequires: libxml2 libstdc++ libgcc BuildRequires: cmake extra-cmake-modules BuildRequires: libcap-devel libdrm-devel >= 2.4.62 libepoxy-devel >= 1.2 fontconfig-devel freetype-devel libgbm-devel libICE-devel libinput-devel >= 1.9 kdecoration-devel mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel pkgconfig(libudev) @@ -177,6 +178,9 @@ cp COPYING* %{buildroot}%{_datadir}/licenses/ukui-kwin/ %{_includedir}/ukui-kwin/*.h %changelog +* Fri Jul 29 2022 peijiankang - 1.0.4-5 +- modify complie error of kde5.95 + * Fri Apr 8 2022 peijiankang - 1.0.4-4 - remove kwin requires