!13 [sync] PR-11: modify find X11::X11 error

From: @openeuler-sync-bot 
Reviewed-by: @dou33 
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2022-02-23 06:01:26 +00:00 committed by Gitee
commit 4e587c9fb3
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 36 additions and 6 deletions

View File

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

View File

@ -11,7 +11,7 @@
Name: kf5-%{framework} Name: kf5-%{framework}
Version: 5.90.0 Version: 5.90.0
Release: 1 Release: 2
Summary: KDE Frameworks 5 Tier 1 integration module with classes for windows management Summary: KDE Frameworks 5 Tier 1 integration module with classes for windows management
License: LGPLv2+ and MIT License: LGPLv2+ and MIT
@ -24,8 +24,8 @@ URL: https://invent.kde.org/frameworks/%{framework}
%else %else
%global stable stable %global stable stable
%endif %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 # filter plugin provides
%global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$ %global __provides_exclude_from ^(%{_kf5_plugindir}/.*\\.so)$
@ -43,11 +43,11 @@ BuildRequires: qt5-qttools-devel
BuildRequires: qt5-qtx11extras-devel BuildRequires: qt5-qtx11extras-devel
%if 0%{?tests} %if 0%{?tests}
BuildRequires: openbox BuildRequires: openbox
%if 0%{?fedora} %if 0%{?fedora}
BuildRequires: weston BuildRequires: weston
%endif %endif
BuildRequires: xorg-x11-server-Xvfb BuildRequires: xorg-x11-server-Xvfb
%endif %endif
Requires: kf5-filesystem >= %{majmin} Requires: kf5-filesystem >= %{majmin}
@ -113,6 +113,9 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
%changelog %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 * Sat Feb 12 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.90.0-1
- update to upstream version 5.90.0 - update to upstream version 5.90.0