From 431685b962d8d20df57e8c6cb4ac8783f9df295e Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Mon, 25 Nov 2024 01:12:48 +0800 Subject: [PATCH] adopt to new cmake macro --- 0002-set-CXX-standard-for-17-for-icu-76.patch | 96 +++++++++++++++++++ deepin-log-viewer.spec | 15 +-- 2 files changed, 105 insertions(+), 6 deletions(-) create mode 100644 0002-set-CXX-standard-for-17-for-icu-76.patch diff --git a/0002-set-CXX-standard-for-17-for-icu-76.patch b/0002-set-CXX-standard-for-17-for-icu-76.patch new file mode 100644 index 0000000..b35b95c --- /dev/null +++ b/0002-set-CXX-standard-for-17-for-icu-76.patch @@ -0,0 +1,96 @@ +From 4a1f541f3d57738a0a395b79cfd208262cc84601 Mon Sep 17 00:00:00 2001 +From: Funda Wang +Date: Mon, 25 Nov 2024 01:12:09 +0800 +Subject: [PATCH] set CXX standard for 17 for icu 76 + +--- + application/CMakeLists.txt | 4 ++-- + logViewerAuth/CMakeLists.txt | 4 ++-- + logViewerService/CMakeLists.txt | 2 +- + logViewerTruncate/CMakeLists.txt | 2 +- + tests/CMakeLists.txt | 2 +- + 5 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt +index 206f739..0b50a7d 100755 +--- a/application/CMakeLists.txt ++++ b/application/CMakeLists.txt +@@ -29,7 +29,7 @@ configure_file(config.h.in config.h @ONLY) + + + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_VERBOSE_MAKEFILE ON) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_C_STANDARD_REQUIRED ON) +@@ -38,7 +38,7 @@ set(CMAKE_AUTORCC ON) + #set(CMAKE_CXX_FLAGS "-g -Wall") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -ldtkwidget -ldtkgui -ldtkcore")#${EXE_NAME} + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed -fPIE") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") + #安全测试加固编译参数 + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -z relro -z now -z noexecstack -pie") +diff --git a/logViewerAuth/CMakeLists.txt b/logViewerAuth/CMakeLists.txt +index 6dde89e..c382d66 100644 +--- a/logViewerAuth/CMakeLists.txt ++++ b/logViewerAuth/CMakeLists.txt +@@ -9,12 +9,12 @@ set (EXE_NAME logViewerAuth) + set(LINK_LIBS + Qt5::Core + ) +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTORCC ON) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") +-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++17") + #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -g -fsanitize=undefined,address -O2") + #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fsanitize=undefined,address -O2") + +diff --git a/logViewerService/CMakeLists.txt b/logViewerService/CMakeLists.txt +index be646ef..a5cb4b5 100755 +--- a/logViewerService/CMakeLists.txt ++++ b/logViewerService/CMakeLists.txt +@@ -6,7 +6,7 @@ endif () + #这里项目名称绝对不能和编译出的target名称一样 + project(log-view-service) + +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTORCC ON) +diff --git a/logViewerTruncate/CMakeLists.txt b/logViewerTruncate/CMakeLists.txt +index ce552de..e60f745 100644 +--- a/logViewerTruncate/CMakeLists.txt ++++ b/logViewerTruncate/CMakeLists.txt +@@ -10,7 +10,7 @@ set (EXE_NAME logViewerTruncate) + set(LINK_LIBS + Qt5::Core + ) +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_AUTOMOC ON) + set(CMAKE_AUTORCC ON) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index 684b8e8..09642a4 100755 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -20,7 +20,7 @@ set(LINK_LIBS + ADD_COMPILE_OPTIONS(-fno-access-control) + ADD_COMPILE_OPTIONS(-fno-inline) + set (PROJECT_NAME_TEST deepin-log-viewer-test) +-set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD 17) + set(CMAKE_VERBOSE_MAKEFILE ON) + set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(CMAKE_C_STANDARD_REQUIRED ON) +-- +2.43.0 + diff --git a/deepin-log-viewer.spec b/deepin-log-viewer.spec index 5740cb8..caf8aec 100644 --- a/deepin-log-viewer.spec +++ b/deepin-log-viewer.spec @@ -1,4 +1,4 @@ -%define pkgrelease 1 +%define pkgrelease 2 %if 0%{?openeuler} %define specrelease %{pkgrelease} %else @@ -14,6 +14,7 @@ License: GPLv3+ URL: https://github.com/linuxdeepin/%{name} Source0: %{name}-%{version}.tar.gz Patch0: 0001-feat-round-master-function.patch +Patch1: 0002-set-CXX-standard-for-17-for-icu-76.patch BuildRequires: qt5-devel BuildRequires: gcc-c++ @@ -53,13 +54,11 @@ Log Viewer is a useful tool for viewing system logs. %build export PATH=%{_qt5_bindir}:$PATH sed -i "s|^cmake_minimum_required.*|cmake_minimum_required(VERSION 3.0)|" $(find . -name "CMakeLists.txt") -mkdir build && pushd build -%cmake -DCMAKE_BUILD_TYPE=Release ../ -DAPP_VERSION=%{version} -DVERSION=%{version} -%make_build -popd +%cmake -DCMAKE_BUILD_TYPE=Release -DAPP_VERSION=%{version} -DVERSION=%{version} +%cmake_build %install -%make_install -C build INSTALL_ROOT="%buildroot" +%cmake_install %files @@ -80,6 +79,10 @@ popd %changelog +* Mon Nov 25 2024 Funda Wang - 5.9.13-2 +- adopt to new cmake macro +- set cxx standard to 17 for icu 76 + * Wed Jul 26 2023 leeffo - 5.9.13-1 - upgrade to version 5.9.13 -- Gitee