From b2069d57da5ab23fcae5d930fbbe89406345455e Mon Sep 17 00:00:00 2001 From: peijiankang Date: Thu, 24 Jul 2025 16:45:54 +0800 Subject: [PATCH] fix build error about make_build (cherry picked from commit 27be014920427cee4d6a2c3d8799aa0fed54d611) --- 0001-fix-build-error-about-make_build.patch | 25 +++++++++++++++++++++ ukui-screensaver.spec | 14 +++++++----- 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 0001-fix-build-error-about-make_build.patch diff --git a/0001-fix-build-error-about-make_build.patch b/0001-fix-build-error-about-make_build.patch new file mode 100644 index 0000000..bb3198f --- /dev/null +++ b/0001-fix-build-error-about-make_build.patch @@ -0,0 +1,25 @@ +From fee445645f754100b4e0e9a25d69ca27b93bc237 Mon Sep 17 00:00:00 2001 +From: peijiankang +Date: Thu, 24 Jul 2025 17:46:20 +0800 +Subject: [PATCH] fix build error about make_build + +--- + i18n_ts/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/i18n_ts/CMakeLists.txt b/i18n_ts/CMakeLists.txt +index f4b0cef..96e8518 100644 +--- a/i18n_ts/CMakeLists.txt ++++ b/i18n_ts/CMakeLists.txt +@@ -1,7 +1,7 @@ + find_package(Qt5LinguistTools) + + file(GLOB ts_files *.ts) +-qt5_create_translation(qm_files ${ts_files}) ++qt5_add_translation(qm_files ${ts_files}) + add_custom_target(i18n + DEPENDS ${qm_files} + SOURCES ${ts_files} +-- +2.25.1 + diff --git a/ukui-screensaver.spec b/ukui-screensaver.spec index a2a7ea8..dca6013 100644 --- a/ukui-screensaver.spec +++ b/ukui-screensaver.spec @@ -1,6 +1,6 @@ Name: ukui-screensaver Version: 4.0.0.0 -Release: 2 +Release: 3 Summary: Screensaver for UKUI desktop environment License: GPL-3+ and GPL-2+ URL: http://www.ukui.org @@ -8,7 +8,7 @@ Source0: %{name}-%{version}.tar.gz Patch01: 0001-ukui-screensaver-resolve-compilation-errors.patch Patch02: 0001-fix-ukui-screensaver-4.0.0.0-about-ukui-screensaver-qt.patch - +Patch03: 0001-fix-build-error-about-make_build.patch BuildRequires: cmake BuildRequires: qt5-qtbase-devel BuildRequires: qt5-qtx11extras-devel @@ -56,12 +56,11 @@ provided by biometric-auth service. %autosetup -n %{name}-%{version} -p1 %build -cmake . -%{make_build} +%cmake +%{cmake_build} %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=%{buildroot} +%{cmake_install} %clean rm -rf $RPM_BUILD_ROOT @@ -100,6 +99,9 @@ fi %changelog +* Thu Jul 24 2025 peijiankang - 4.0.0.0-3 +- fix build error about make_build + * Tue Sep 03 2024 peijiankang - 4.0.0.0-2 - add 0001-fix-ukui-screensaver-4.0.0.0-about-ukui-screensaver-qt.patch -- Gitee