Compare commits

...

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
fd9fdebb7b
!27 Update package to version 5.113.0
From: @jxy_git 
Reviewed-by: @open-bot 
Signed-off-by: @open-bot
2024-01-08 03:46:32 +00:00
jxy_git
0092a43081 Update package to version 5.113.0 2024-01-04 10:23:13 +08:00
openeuler-ci-bot
3599433929
!23 update version to 5.108.0
From: @peijiankang 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2023-08-04 06:06:58 +00:00
peijiankang
241c3e16c8 update version to 5.108.0 2023-08-04 09:18:00 +08:00
openeuler-ci-bot
e98788323d
!19 Update package to version 5.100.0
From: @liqiuyu123 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-12-13 09:26:13 +00:00
liqiuyu123
7dd559d5af Update package to version 5.100.0 2022-12-12 13:00:40 +08:00
openeuler-ci-bot
481183319a
!18 update to upstream version 5.97.0
From: @leeffo 
Reviewed-by: @weidongkl 
Signed-off-by: @weidongkl
2022-09-08 01:19:02 +00:00
leeffo
b9620e75ba update to upstream version 5.97.0 2022-09-05 17:38:14 +08:00
openeuler-ci-bot
9bb7ad2be4
!16 [sync] PR-15: update to upstream version 5.95.0
From: @openeuler-sync-bot 
Reviewed-by: @dou33 
Signed-off-by: @dou33
2022-07-25 13:18:23 +00:00
huayadong
45b7dac8da update to upstream version 5.95.0
(cherry picked from commit 882c8a99691c5c45acd6e0545ef200ef504ca6c2)
2022-07-25 20:35:30 +08:00
4 changed files with 27 additions and 49 deletions

View File

@ -1,27 +0,0 @@
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,4 +1,3 @@
%undefine __cmake_in_source_build
%global framework kwindowsystem %global framework kwindowsystem
## uncomment to enable bootstrap mode ## uncomment to enable bootstrap mode
@ -10,22 +9,16 @@
%endif %endif
Name: kf5-%{framework} Name: kf5-%{framework}
Version: 5.90.0 Version: 5.113.0
Release: 2 Release: 1
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
URL: https://invent.kde.org/frameworks/%{framework} URL: https://invent.kde.org/frameworks/%{framework}
%global majmin %(echo %{version} | cut -d. -f1-2) %global majmin %majmin_ver_kf5
%global revision %(echo %{version} | cut -d. -f3) %global stable %stable_kf5
%if %{revision} >= 50 Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz
%global stable unstable
%else
%global stable stable
%endif
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)$
@ -44,9 +37,7 @@ BuildRequires: qt5-qtx11extras-devel
%if 0%{?tests} %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 %endif
@ -58,7 +49,7 @@ working with windows.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Requires: %{name}%{?_isa} = %{version}-%{release} Requires: %{name} = %{version}-%{release}
Requires: qt5-qtbase-devel Requires: qt5-qtbase-devel
%description devel %description devel
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
@ -72,7 +63,7 @@ developing applications that use %{name}.
%build %build
mkdir %{_target_platform} mkdir %{_target_platform}
pushd %{_target_platform} pushd %{_target_platform}
%{cmake_kf5} .. \ %cmake_kf5 .. \
-DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF} -DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
popd popd
@ -101,11 +92,10 @@ make test ARGS="--output-on-failure --timeout 30" -C %{_target_platform} ||:
%{_kf5_datadir}/qlogging-categories5/%{framework}.* %{_kf5_datadir}/qlogging-categories5/%{framework}.*
%{_kf5_libdir}/libKF5WindowSystem.so.* %{_kf5_libdir}/libKF5WindowSystem.so.*
%dir %{_kf5_plugindir}/kwindowsystem/ %dir %{_kf5_plugindir}/kwindowsystem/
%{_kf5_plugindir}/kwindowsystem/KF5WindowSystemWaylandPlugin.so #{_kf5_plugindir}/kwindowsystem/KF5WindowSystemWaylandPlugin.so
%{_kf5_plugindir}/kwindowsystem/KF5WindowSystemX11Plugin.so %{_kf5_plugindir}/kwindowsystem/KF5WindowSystemX11Plugin.so
%files devel %files devel
%{_kf5_includedir}/kwindowsystem_version.h
%{_kf5_includedir}/KWindowSystem/ %{_kf5_includedir}/KWindowSystem/
%{_kf5_libdir}/libKF5WindowSystem.so %{_kf5_libdir}/libKF5WindowSystem.so
%{_kf5_libdir}/cmake/KF5WindowSystem/ %{_kf5_libdir}/cmake/KF5WindowSystem/
@ -113,13 +103,28 @@ 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 * Thu Jan 04 2024 jiangxinyu <jiangxinyu@kylinos.cn> - 5.113.0-1
- Update package to version 5.113.0
* Thu Aug 03 2023 peijiankang <peijiankang@kylinos.cn> - 5.108.0-1
- Update package to version 5.108.0
* 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 - 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
* Fri Jan 14 2022 pei-jiankang<peijiankang@kylinos.cn> - 5.88.0-1 * Fri Jan 14 2022 pei-jiankang <peijiankang@kylinos.cn> - 5.88.0-1
- update to upstream version 5.88.0 - update to upstream version 5.88.0
* Mon Dec 13 2021 douyan <douyan@kylinos.cn> - 5.55.0-2 * Mon Dec 13 2021 douyan <douyan@kylinos.cn> - 5.55.0-2

Binary file not shown.

Binary file not shown.