Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
5b76b466b2
!22 [sync] PR-19: Update package to version 5.100.0
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-04-19 06:27:26 +00:00
liqiuyu123
6222a5c3aa Update package to version 5.100.0
(cherry picked from commit 7dd559d5af674e8b2d76fd90553ed3d1d574540f)
2023-04-19 14:00:56 +08:00
openeuler-ci-bot
6b1f10886f
!21 [sync] PR-18: update to upstream version 5.97.0
From: @openeuler-sync-bot 
Reviewed-by: @peijiankang 
Signed-off-by: @peijiankang
2023-04-19 06:00:37 +00:00
leeffo
1f56ab1797 update to upstream version 5.97.0
(cherry picked from commit b9620e75baeef30c960c47e5679bd0b1b368f167)
2023-04-19 13:39:39 +08:00
openeuler-ci-bot
576b9affbf
!15 update to upstream version 5.95.0
From: @hua_yadong 
Reviewed-by: @peijiankang, @dou33 
Signed-off-by: @peijiankang, @dou33
2022-07-25 12:34:28 +00:00
huayadong
882c8a9969 update to upstream version 5.95.0 2022-07-06 15:00:19 +08:00
openeuler-ci-bot
4e587c9fb3
!13 [sync] PR-11: modify find X11::X11 error
From: @openeuler-sync-bot 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-02-23 06:01:26 +00:00
pei-jiankang
d974d40195 modify find X11::X11 error
(cherry picked from commit 96036075e54a77e5f9aacd0daaa54d4d01581481)
2022-02-23 13:41:57 +08:00
openeuler-ci-bot
bfb8b2965d
!9 update to upstream version 5.90.0
From: @pei-jiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-02-14 02:38:48 +00:00
pei-jiankang
3065a8a45b update to upstream version 5.90.0 2022-02-12 14:03:29 +08:00
4 changed files with 55 additions and 12 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

@ -1,8 +1,7 @@
%undefine __cmake_in_source_build
%global framework kwindowsystem
## uncomment to enable bootstrap mode
%global bootstrap 1
#global bootstrap 1
## currently includes no tests
%if !0%{?bootstrap}
@ -10,7 +9,7 @@
%endif
Name: kf5-%{framework}
Version: 5.88.0
Version: 5.100.0
Release: 1
Summary: KDE Frameworks 5 Tier 1 integration module with classes for windows management
@ -24,8 +23,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 +42,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}
@ -72,7 +71,7 @@ developing applications that use %{name}.
%build
mkdir %{_target_platform}
pushd %{_target_platform}
%{cmake_kf5} .. \
%cmake_kf5 .. \
-DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
popd
@ -101,11 +100,10 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
%{_kf5_datadir}/qlogging-categories5/%{framework}.*
%{_kf5_libdir}/libKF5WindowSystem.so.*
%dir %{_kf5_plugindir}/kwindowsystem/
%{_kf5_plugindir}/kwindowsystem/KF5WindowSystemWaylandPlugin.so
#{_kf5_plugindir}/kwindowsystem/KF5WindowSystemWaylandPlugin.so
%{_kf5_plugindir}/kwindowsystem/KF5WindowSystemX11Plugin.so
%files devel
%{_kf5_includedir}/kwindowsystem_version.h
%{_kf5_includedir}/KWindowSystem/
%{_kf5_libdir}/libKF5WindowSystem.so
%{_kf5_libdir}/cmake/KF5WindowSystem/
@ -113,8 +111,26 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
%changelog
* Fri Jan 14 2022 pei-jiankang<peijiankang@kylinos.com> - 5.88.0-1
* Mon Dec 12 2022 liqiuyu <liqiuyu@kylinos.cn> - 5.100.0-1
- Update package to version 5.100.0
* Mon Sep 05 2022 liweiganga <liweiganga@uniontech.com> - 5.97.0-1
- update to upstream version 5.97.0
* Tue Jul 05 2022 huayadong <huayadong@kylinos.cn> - 5.95.0-1
- update to upstream version 5.95.0
* 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
* Fri Jan 14 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.88.0-1
- update to upstream version 5.88.0
* Mon Dec 13 2021 douyan <douyan@kylinos.cn> - 5.55.0-2
- remove %{?dist}
* Thu Jul 23 2020 Zhao Yang <yangzhao1@kylinos.cn> - 5.55.0-1
- Initial release for OpenEuler

Binary file not shown.

Binary file not shown.