Merge pull request #318 from myk1343/release/eagle

Release/eagle
linuxdeepin · Aug 20, 2024 · f888614 · f888614
2 parents 808154a + a389014
commit f888614
Show file tree

Hide file tree

Showing 551 changed files with 55,233 additions and 4,542 deletions.
diff --git a/.github/workflows/backup-to-gitlab.yml b/.github/workflows/backup-to-gitlab.yml
@@ -8,10 +8,8 @@ concurrency:
 jobs:
   backup-to-gitlabwh:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitlabwh.yml@master
-    secrets:
-      BRIDGETOKEN: ${{ secrets.BRIDGETOKEN }}
+    secrets: inherit
 
   backup-to-gitee:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitee.yml@master
-    secrets:
-      GITEE_SYNC_TOKEN: ${{ secrets.GITEE_SYNC_TOKEN }}
+    secrets: inherit
diff --git a/.github/workflows/call-build-deb.yml b/.github/workflows/call-build-deb.yml
diff --git a/.github/workflows/call-build-distribution.yml b/.github/workflows/call-build-distribution.yml
@@ -10,8 +10,4 @@ on:
 jobs:
   check_job:
     uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
-    secrets:
-      BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
-      BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
-      WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
-      WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
+    secrets: inherit
diff --git a/.github/workflows/call-chatOps.yml b/.github/workflows/call-chatOps.yml
@@ -6,5 +6,4 @@ on:
 jobs:
   chatopt:
     uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit
diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - run: export
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           persist-credentials: false

diff --git a/.obs/workflows.yml b/.obs/workflows.yml
@@ -0,0 +1,44 @@
+test_build:
+  steps:
+    - link_package:
+        source_project: deepin:Develop:dde
+        source_package: %{SCM_REPOSITORY_NAME}
+        target_project: deepin:CI
+
+    - configure_repositories:
+        project: deepin:CI
+        repositories:
+          - name: deepin_develop
+            paths:
+              - target_project: deepin:CI
+                target_repository: deepin_develop
+            architectures:
+              - x86_64
+              - aarch64
+
+          - name: debian
+            paths:
+              - target_project: deepin:CI
+                target_repository: debian_sid
+            architectures:
+              - x86_64
+
+  filters:
+    event: pull_request
+
+tag_build:
+  steps:
+    - branch_package:
+        source_project: deepin:Develop:dde
+        source_package: %{SCM_REPOSITORY_NAME}
+        target_project: deepin:Unstable:dde
+  filters:
+    event: tag_push
+
+commit_build:
+  steps:
+    - trigger_services:
+        project: deepin:Develop:dde
+        package: %{SCM_REPOSITORY_NAME}
+  filters:
+    event: push
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -4,7 +4,7 @@ Upstream-Contact: UnionTech Software Technology Co., Ltd. <>
 Source: https://github.com/linuxdeepin/deepin-log-viewer
 
 # ci
-Files: .github/*
+Files: .github/* .obs/workflows.yml
 Copyright: None
 License: CC0-1.0
 

diff --git a/.tx/config b/.tx/config
@@ -3,26 +3,26 @@ host = https://www.transifex.com
 minimum_perc = 80
 mode = developer
 
-[deepin-log-viewer.deepin-log-viewer]
+[o:linuxdeepin:p:deepin-log-viewer:r:deepin-log-viewer]
 file_filter = translations/deepin-log-viewer_<lang>.ts
 source_file = translations/deepin-log-viewer.ts
 source_lang = en
 type = QT
 
-[deepin-log-viewer.deepin-log-viewer-desktop-ts]
+[o:linuxdeepin:p:deepin-log-viewer:r:deepin-log-viewer-desktop-ts]
 file_filter = translations/desktop/desktop_<lang>.ts
 source_file = translations/desktop/desktop.ts
 source_lang = en
 type = QT
 
-[deepin-log-viewer.deepin-log-viewer-policy-auth-ts]
+[o:linuxdeepin:p:deepin-log-viewer:r:deepin-log-viewer-policy-auth-ts]
 file_filter = translations/policy/auth/policy_<lang>.ts
 source_file = translations/policy/auth/policy.ts
 source_lang = en
 type = QT
 
 
-[deepin-log-viewer.deepin-log-viewer-policy-truncate-ts]
+[o:linuxdeepin:p:deepin-log-viewer:r:deepin-log-viewer-policy-truncate-ts]
 file_filter = translations/policy/truncate/policy_<lang>.ts
 source_file = translations/policy/truncate/policy.ts
 source_lang = en

diff --git a/.tx/deepin.conf b/.tx/deepin.conf
@@ -1,2 +1,2 @@
 [transifex]
-branch = m20
+branch = m23
diff --git a/3rdparty/DocxFactory/include/DocxFactory/os/OsFunc.h b/3rdparty/DocxFactory/include/DocxFactory/os/OsFunc.h
@@ -51,7 +51,7 @@ namespace DocxFactory
 		static string fileUrlToPath		( const string& p_url );
 		static string normalizeFileUrl	( const string& p_url );
 
-		static byte* readFile(
+        static byte *readFile(
 			const string&	p_fileName,
 			size_t&			p_bufSize );
 

diff --git a/3rdparty/DocxFactory/include/DocxFactory/zip/UnzipFile.h b/3rdparty/DocxFactory/include/DocxFactory/zip/UnzipFile.h
@@ -31,11 +31,11 @@ class UnzipFile
 
     // functions for extracting file entries content from the zip file
 
-    byte *extractEntryToBuf(
+    DocxFactory::byte *extractEntryToBuf(
         const string   &p_path,
         size_t         &p_bufSize) const;
 
-    byte *extractEntryToRaw(
+    DocxFactory::byte *extractEntryToRaw(
         const string   &p_path,
         int            &p_method,
         int            &p_level,

diff --git 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<byte>   l_buf(OsFunc::readFile(m_dataFile, l_bufSize));
+        boost::scoped_array<DocxFactory::byte>   l_buf(OsFunc::readFile(m_dataFile, l_bufSize));
 
         l_data = string((char *) l_buf.get(), l_bufSize);
     }

diff --git a/3rdparty/DocxFactory/src/locale/LocaleFunc.cpp b/3rdparty/DocxFactory/src/locale/LocaleFunc.cpp
@@ -1018,14 +1018,14 @@ double LocaleFunc::strToNum(const string &p_str)
     if (!m_initialized)
         initialize();
 
-    enum Part {
-        PREFIX = 0,
-        INTEGER,
-        FRACTION,
-        SUFFIX
+    enum _Part {
+        _PREFIX = 0,
+        _INTEGER,
+        _FRACTION,
+        _SUFFIX
     };
 
-    Part    l_part  = PREFIX;
+    _Part    l_part  = _PREFIX;
     double  l_val   = 0;
     double  l_dec   = 1;
     char    l_neg   = 0;
@@ -1041,54 +1041,54 @@ double LocaleFunc::strToNum(const string &p_str)
             if (l_neg != 0)
                 break;
 
-            if (l_part == INTEGER || l_part == FRACTION)
-                l_part = SUFFIX;
+            if (l_part == _INTEGER || l_part == _FRACTION)
+                l_part = _SUFFIX;
 
             l_neg = l_ch;
         }
 
         else if (l_ch == ' '
 
                  // if thousand separator is also space then treated as space only in prefix and suffix.
-                 && (m_numThSep != ' ' || l_part == PREFIX || l_part == SUFFIX)) {
-            if (l_part == INTEGER || l_part == FRACTION)
-                l_part = SUFFIX;
+                 && (m_numThSep != ' ' || l_part == _PREFIX || l_part == _SUFFIX)) {
+            if (l_part == _INTEGER || l_part == _FRACTION)
+                l_part = _SUFFIX;
 
-            if (l_part == SUFFIX  && l_neg != 0)
+            if (l_part == _SUFFIX  && l_neg != 0)
                 break;
         }
 
         else if (IS_DIGIT(l_ch)) {
-            if (l_part == PREFIX)
-                l_part = INTEGER;
+            if (l_part == _PREFIX)
+                l_part = _INTEGER;
 
             switch (l_part) {
-            case INTEGER:
+            case _INTEGER:
                 l_val = l_val * 10 + (l_ch - 48);
                 break;
 
-            case FRACTION:
+            case _FRACTION:
                 l_dec = l_dec * 10;
                 l_val = l_val + (l_ch - 48) / l_dec;
                 break;
             default:
                 break;
             }
 
-            if (l_part == SUFFIX)
+            if (l_part == _SUFFIX)
                 break;
         }
 
         else if (l_ch == m_numFracSep) {
-            if (l_part == PREFIX || l_part == INTEGER)
-                l_part = FRACTION;
+            if (l_part == _PREFIX || l_part == _INTEGER)
+                l_part = _FRACTION;
 
             else
                 break;
         }
 
         else if (l_ch == m_numThSep) {
-            if (l_part != INTEGER && l_part != FRACTION)
+            if (l_part != _INTEGER && l_part != _FRACTION)
                 break;
         }
 

diff --git 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
@@ -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
@@ -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/CMakeLists.txt b/CMakeLists.txt
@@ -12,6 +12,9 @@ add_subdirectory(logViewerTruncate)
 
 add_subdirectory(logViewerService)
 
-add_subdirectory(tests)
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_subdirectory(tests)
+endif()
+
 add_subdirectory(liblogviewerplugin)
 option(PERF_ON "open the info of benchmark" ON)