From 8dae578a94400156496bdb5a8d033a8de27d1019 Mon Sep 17 00:00:00 2001 From: pangqing Date: Tue, 5 Aug 2025 10:21:15 +0800 Subject: [PATCH] fix dde-session-shell build error Signed-off-by: pangqing --- 0003-fix-dde-session-shell-build-error.patch | 25 ++++++++++++++++++++ dtkcore.spec | 6 ++++- 2 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 0003-fix-dde-session-shell-build-error.patch diff --git a/0003-fix-dde-session-shell-build-error.patch b/0003-fix-dde-session-shell-build-error.patch new file mode 100644 index 0000000..d2a5124 --- /dev/null +++ b/0003-fix-dde-session-shell-build-error.patch @@ -0,0 +1,25 @@ +From 3726bc1c1fcf2688ce7e6876825958430b03e169 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Mon, 4 Aug 2025 08:58:57 +0000 +Subject: [PATCH] fix dde-session-shell build error + +--- + cmake/DtkCMake/DtkCMakeConfig.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmake/DtkCMake/DtkCMakeConfig.cmake b/cmake/DtkCMake/DtkCMakeConfig.cmake +index a118223..0a4aa70 100644 +--- a/cmake/DtkCMake/DtkCMakeConfig.cmake ++++ b/cmake/DtkCMake/DtkCMakeConfig.cmake +@@ -20,7 +20,7 @@ function(formatString string) + endfunction() + + macro(execDeepinOsRelease args output) +- exec_program(${DEEPIN_OS_RELEASE_TOOL} ARGS ${args} OUTPUT_VARIABLE ${output} RETURN_VALUE exitCode) ++ execute_process(COMMAND ${DEEPIN_OS_RELEASE_TOOL} ARGS ${args} OUTPUT_VARIABLE $(output) RESULT_VARIABLE exitCode) + + if(NOT ${exitCode} EQUAL 0) + message(FATAL_ERROR "exec deepin-os-release failed, with args: ${args}, error message: ${output}") +-- +2.50.1 + diff --git a/dtkcore.spec b/dtkcore.spec index 198a0f8..0f8f544 100644 --- a/dtkcore.spec +++ b/dtkcore.spec @@ -1,7 +1,7 @@ %define __cmake_builddir $(pwd) Name: dtkcore Version: 5.6.8.2 -Release: 2%{?dist}.03 +Release: 2%{?dist}.04 Summary: Deepin tool kit core modules License: LGPL-3.0-or-later URL: https://github.com/linuxdeepin/dtkcore @@ -9,6 +9,7 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz Patch0001: 0001-LSHW-returns-a-multi-element-array-when-querying-mem.patch Patch0002: 0002-set-default-c++17.patch +Patch0003: 0003-fix-dde-session-shell-build-error.patch BuildRequires: gcc-c++ #BuildRequires: annobin @@ -79,6 +80,9 @@ export PATH=%{_qt5_bindir}:$PATH %changelog +* Tue Aug 05 2025 pangqing - 5.6.8.2-2.04 +- fix dde-session-shell build error + * Mon Aug 04 2025 pangqing - 5.6.8.2-2.03 - set default c++17 -- Gitee