!26 fixed kf5-kwayland build failure in openEuler-24.03-LTS-SP1:epol

From: @chenyanpanX 
Reviewed-by: @misaka00251 
Signed-off-by: @misaka00251
This commit is contained in:
openeuler-ci-bot 2024-11-18 06:56:56 +00:00 committed by Gitee
commit d5c7a5f5bf
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F

View File

@ -12,7 +12,7 @@
Name: kf5-%{framework} Name: kf5-%{framework}
Version: 5.113.0 Version: 5.113.0
Release: 1 Release: 2
Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries Summary: KDE Frameworks 5 library that wraps Client and Server Wayland libraries
License: GPL-2.0-or-later License: GPL-2.0-or-later
URL: https://invent.kde.org/frameworks/%{framework} URL: https://invent.kde.org/frameworks/%{framework}
@ -65,25 +65,15 @@ developing applications that use %{name}.
%autosetup -n %{framework}-%{version} -p1 %autosetup -n %{framework}-%{version} -p1
%build %build
mkdir %{_target_platform} %{cmake_kf5}
pushd %{_target_platform} %{cmake_build}
%{cmake_kf5} .. \
-DBUILD_TESTING:BOOL=%{?tests:ON}%{!?tests:OFF}
popd
%make_build -C %{_target_platform}
%install %install
make install/fast DESTDIR=%{buildroot} -C %{_target_platform} %{cmake_install}
%check %check
%if 0%{?tests} %{ctest}
export CTEST_OUTPUT_ON_FAILURE=1
xvfb-run -a \
dbus-launch --exit-with-session \
time \
make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:
%endif
%ldconfig_scriptlets %ldconfig_scriptlets
@ -105,6 +95,9 @@ make test ARGS="--output-on-failure --timeout 20" -C %{_target_platform} ||:
%{_kf5_archdatadir}/mkspecs/modules/qt_KWaylandServer.pri %{_kf5_archdatadir}/mkspecs/modules/qt_KWaylandServer.pri
%changelog %changelog
* Fri Nov 15 2024 ChenYanpan <chenyanpan@xfusion.com> - 5.113.0-2
- adapt to the new CMake macros to fix build failure
* Mon Jan 08 2024 zhangxianting <zhangxianting@uniontech.com> - 5.113.0-1 * Mon Jan 08 2024 zhangxianting <zhangxianting@uniontech.com> - 5.113.0-1
- update to upstream version 5.113.0 - update to upstream version 5.113.0