From d974d401950c3360af3806b2653bb0ca85fcdb10 Mon Sep 17 00:00:00 2001
From: pei-jiankang <peijiankang@kylinos.cn>
Date: Wed, 23 Feb 2022 11:44:42 +0800
Subject: [PATCH] modify find X11::X11 error

(cherry picked from commit 96036075e54a77e5f9aacd0daaa54d4d01581481)
---
 0001-modify-find-X11-X11-error.patch | 27 +++++++++++++++++++++++++++
 kf5-kwindowsystem.spec               | 15 +++++++++------
 2 files changed, 36 insertions(+), 6 deletions(-)
 create mode 100644 0001-modify-find-X11-X11-error.patch

diff --git a/0001-modify-find-X11-X11-error.patch b/0001-modify-find-X11-X11-error.patch
new file mode 100644
index 0000000..567d674
--- /dev/null
+++ b/0001-modify-find-X11-X11-error.patch
@@ -0,0 +1,27 @@
+From c6c2611fcc219c391c3c639bb85dc0c86a5abd77 Mon Sep 17 00:00:00 2001
+From: pei-jiankang <peijiankang@kylinos.cn>
+Date: Wed, 23 Feb 2022 11:50:41 +0800
+Subject: [PATCH] modify find X11::X11 error
+
+---
+ KF5WindowSystemConfig.cmake.in | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/KF5WindowSystemConfig.cmake.in b/KF5WindowSystemConfig.cmake.in
+index 98801b2..f6678d4 100644
+--- a/KF5WindowSystemConfig.cmake.in
++++ b/KF5WindowSystemConfig.cmake.in
+@@ -7,9 +7,7 @@ if(NOT @KWINDOWSYSTEM_NO_WIDGETS@)
+     find_dependency(Qt@QT_MAJOR_VERSION@Widgets @REQUIRED_QT_VERSION@)
+ endif()
+ 
+-if(@X11_FOUND@)
+-    find_dependency(X11)
+-endif()
++find_dependency(X11)
+ 
+ if(NOT @BUILD_SHARED_LIBS@)
+     if(@WIN32@)
+-- 
+2.33.0
+
diff --git a/kf5-kwindowsystem.spec b/kf5-kwindowsystem.spec
index 00e1df4..01c42df 100644
--- a/kf5-kwindowsystem.spec
+++ b/kf5-kwindowsystem.spec
@@ -11,7 +11,7 @@
 
 Name:           kf5-%{framework}
 Version:        5.90.0
-Release:        1
+Release:        2
 Summary:        KDE Frameworks 5 Tier 1 integration module with classes for windows management
 
 License:        LGPLv2+ and MIT
@@ -24,8 +24,8 @@ URL:            https://invent.kde.org/frameworks/%{framework}
 %else
 %global stable stable
 %endif
-Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
-
+Source0:        http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
+Patch01:        0001-modify-find-X11-X11-error.patch
 # filter plugin provides
 %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$
 
@@ -43,11 +43,11 @@ BuildRequires:  qt5-qttools-devel
 BuildRequires:  qt5-qtx11extras-devel
 
 %if 0%{?tests}
-BuildRequires: openbox
+BuildRequires:  openbox
 %if 0%{?fedora}
-BuildRequires: weston
+BuildRequires:  weston
 %endif
-BuildRequires: xorg-x11-server-Xvfb
+BuildRequires:  xorg-x11-server-Xvfb
 %endif
 
 Requires:       kf5-filesystem >= %{majmin}
@@ -113,6 +113,9 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
 
 
 %changelog
+* Wed Feb 23 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.90.0-2
+- modify find X11::X11 error
+
 * Sat Feb 12 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.90.0-1
 - update to upstream version 5.90.0