diff --git a/0003-set-default-c++17-and-fix-build-error.patch b/0003-set-default-c++17-and-fix-build-error.patch new file mode 100644 index 0000000000000000000000000000000000000000..4059716b9c69e172dd7650475b2fd85f733e9984 --- /dev/null +++ b/0003-set-default-c++17-and-fix-build-error.patch @@ -0,0 +1,181 @@ +From 2ceef27c2a25bc87aacc0695a06395e2eeccc596 Mon Sep 17 00:00:00 2001 +From: Super User +Date: Mon, 11 Aug 2025 09:44:16 +0000 +Subject: [PATCH] set default c++17 and fix build error + +--- + .../src/WordProcessingMerger/word-processing-merger.cpp | 2 +- + 3rdparty/DocxFactory/src/os/OsFunc.cpp | 8 ++++---- + 3rdparty/DocxFactory/src/xml/XmlFunc.cpp | 4 ++-- + 3rdparty/DocxFactory/src/zip/UnzipFile.cpp | 6 +++--- + application/CMakeLists.txt | 2 +- + logViewerAuth/CMakeLists.txt | 2 +- + logViewerService/CMakeLists.txt | 2 +- + logViewerTruncate/CMakeLists.txt | 2 +- + tests/CMakeLists.txt | 2 +- + 9 files changed, 15 insertions(+), 15 deletions(-) + +diff --git a/3rdparty/DocxFactory/src/WordProcessingMerger/word-processing-merger.cpp b/3rdparty/DocxFactory/src/WordProcessingMerger/word-processing-merger.cpp +index a331f70..671a34c 100644 +--- a/3rdparty/DocxFactory/src/WordProcessingMerger/word-processing-merger.cpp ++++ b/3rdparty/DocxFactory/src/WordProcessingMerger/word-processing-merger.cpp +@@ -468,7 +468,7 @@ void Merger::merge() + + else { + size_t l_bufSize; +- boost::scoped_array l_buf(OsFunc::readFile(m_dataFile, l_bufSize)); ++ boost::scoped_array l_buf(OsFunc::readFile(m_dataFile, l_bufSize)); + + l_data = string((char *) l_buf.get(), l_bufSize); + } +diff --git a/3rdparty/DocxFactory/src/os/OsFunc.cpp b/3rdparty/DocxFactory/src/os/OsFunc.cpp +index 9d128f1..dcafb68 100644 +--- a/3rdparty/DocxFactory/src/os/OsFunc.cpp ++++ b/3rdparty/DocxFactory/src/os/OsFunc.cpp +@@ -284,12 +284,12 @@ string OsFunc::normalizeFileUrl( const string& p_url ) + + + +-byte* OsFunc::readFile( ++DocxFactory::byte* OsFunc::readFile( + const string& p_fileName, + size_t& p_bufSize ) + { + ifstream l_fileStream; +- byte* l_buf = NULL; ++ DocxFactory::byte* l_buf = NULL; + + try + { +@@ -299,7 +299,7 @@ byte* OsFunc::readFile( + throw FileNotFoundException( p_fileName, __FILE__, __LINE__ ); + + p_bufSize = ( size_t ) l_fileStream.tellg(); +- l_buf = new byte[ p_bufSize ]; ++ l_buf = new DocxFactory::byte[ p_bufSize ]; + + l_fileStream.seekg( 0, ios::beg ); + l_fileStream.read( ( char* ) l_buf, p_bufSize ); +@@ -322,7 +322,7 @@ byte* OsFunc::readFile( + + void OsFunc::writeFile( + const string& p_fileName, +- const byte* p_buf, ++ const DocxFactory::byte* p_buf, + size_t p_bufSize, + bool p_append ) + { +diff --git a/3rdparty/DocxFactory/src/xml/XmlFunc.cpp b/3rdparty/DocxFactory/src/xml/XmlFunc.cpp +index 8e6b0b2..0a81837 100644 +--- a/3rdparty/DocxFactory/src/xml/XmlFunc.cpp ++++ b/3rdparty/DocxFactory/src/xml/XmlFunc.cpp +@@ -113,9 +113,9 @@ void XmlFunc::saveDocToFile( const xercesc::DOMDocument* p_doc, const string& p_ + } + } // saveDocToFile + +-byte* XmlFunc::saveDocToBuf( const xercesc::DOMDocument* p_doc, size_t& p_bufSize ) ++DocxFactory::byte* XmlFunc::saveDocToBuf( const xercesc::DOMDocument* p_doc, size_t& p_bufSize ) + { +- byte* l_buf = NULL; ++ DocxFactory::byte* l_buf = NULL; + xercesc::DOMImplementationLS* l_impl = NULL; + xercesc::DOMLSSerializer* l_serializer = NULL; + xercesc::DOMLSOutput* l_outputStream = NULL; +diff --git a/3rdparty/DocxFactory/src/zip/UnzipFile.cpp b/3rdparty/DocxFactory/src/zip/UnzipFile.cpp +index 84a92a7..00b3d1c 100644 +--- a/3rdparty/DocxFactory/src/zip/UnzipFile.cpp ++++ b/3rdparty/DocxFactory/src/zip/UnzipFile.cpp +@@ -73,7 +73,7 @@ void UnzipFile::close() + + + +-byte *UnzipFile::extractEntryToBuf( ++DocxFactory::byte *UnzipFile::extractEntryToBuf( + const string &p_path, + size_t &p_bufSize) const + { +@@ -124,14 +124,14 @@ byte *UnzipFile::extractEntryToBuf( + return l_buf; + } // extract + +-byte *UnzipFile::extractEntryToRaw( ++DocxFactory::byte *UnzipFile::extractEntryToRaw( + const string &p_path, + int &p_method, + int &p_level, + FileInfo *&p_fileInfo, + size_t &p_bufSize) const + { +- byte *l_buf = NULL; ++ DocxFactory::byte *l_buf = NULL; + int l_err; + + if (!m_fileOpen) +diff --git a/application/CMakeLists.txt b/application/CMakeLists.txt +index 206f739..fa8fc74 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) +diff --git a/logViewerAuth/CMakeLists.txt b/logViewerAuth/CMakeLists.txt +index 6dde89e..b5e3130 100644 +--- a/logViewerAuth/CMakeLists.txt ++++ b/logViewerAuth/CMakeLists.txt +@@ -9,7 +9,7 @@ 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) +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.50.1 + diff --git a/deepin-log-viewer.spec b/deepin-log-viewer.spec index 9fb3d9139dea808910aa5ae72af3a85c65632b7f..0aa0bc16beeb15adbdc006c7ad40923f1cb7585c 100644 --- a/deepin-log-viewer.spec +++ b/deepin-log-viewer.spec @@ -1,5 +1,5 @@ %define __cmake_builddir $(pwd) -%define pkgrelease 2 +%define pkgrelease 3 %if 0%{?openeuler} %define specrelease %{pkgrelease} %else @@ -17,6 +17,7 @@ Source0: %{name}-%{version}.tar.gz Patch0: 0001-feat-round-master-function.patch Patch1: 0001-fix-xorg-application-log-problem.patch Patch2: 0002-add-boot.log-file-judge.patch +Patch3: 0003-set-default-c++17-and-fix-build-error.patch BuildRequires: qt5-devel BuildRequires: gcc-c++ @@ -93,6 +94,9 @@ cp %buildroot/usr/lib/deepin-daemon/log-view-service %buildroot/usr/bin/log-vie %changelog +* Mon Aug 11 2025 pangqing - 5.9.13-3 +- set default c++17 and fix build error + * Thu Sep 21 2023 hanshuang - 5.9.13-2 - fix xorg application log problem