Update version number and libs (#1365)

IB-8679, IB-8682

* Qt 6.10.1
* OpenSSL 3.5.4

Signed-off-by: Raul Metsma <[email protected]>

Author: metsma

.github/workflows/build.yml

@@ -14,7 +14,8 @@ jobs:
       MACOSX_DEPLOYMENT_TARGET: 13.0
       LIBS_PATH: ${{ github.workspace }}/cache
     steps:
-    - name: Checkout
+    - &Checkout
+      name: Checkout
       uses: actions/checkout@v5
       with:
         submodules: recursive
@@ -41,12 +42,12 @@ jobs:
         key: vcpkg-macOS-${{ hashFiles('prepare_osx_build_environment.sh') }}
     - name: Build libraries
       run: |
-        mkdir -p ${LIBS_PATH}/Qt-6.9.2-OpenSSL
+        mkdir -p ${LIBS_PATH}/Qt-6.10.1-OpenSSL
         ./prepare_osx_build_environment.sh -p ${LIBS_PATH}
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.9.2
+        version: 6.10.1
         arch: clang_64
     - name: Build
       run: |
@@ -59,7 +60,7 @@ jobs:
         cmake --build build --target macdeployqt
         cmake --build build --target zip
     - name: Archive artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: macOS
         path: build/qdigidoc4*.zip
@@ -86,10 +87,13 @@ jobs:
         repo: open-eid/libdigidocpp
     - name: Install dependencies
       run: apt update -qq && apt install --no-install-recommends -y git lsb-release build-essential devscripts debhelper pkg-config lintian ${UBUNTU_DEPS}
-    - name: Checkout
-      uses: actions/checkout@v5
-      with:
-        submodules: recursive
+    - name: Install gcc 12
+      if: matrix.container == '22.04'
+      run: |
+        apt install -y gcc-12 g++-12
+        update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-12 60 --slave /usr/bin/g++ g++ /usr/bin/g++-12
+        update-alternatives --set gcc /usr/bin/gcc-12
+    - *Checkout
     - name: Setup changelog
       run: |
         export VERSION=$(grep project CMakeLists.txt | egrep -o "([0-9]{1,}\.)+[0-9]{1,}")
@@ -102,7 +106,7 @@ jobs:
     - name: Lintian
       run: lintian *.deb;
     - name: Archive artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: ubuntu_${{ matrix.container }}_${{ matrix.arch }}
         path: qdigidoc4*.*
@@ -124,32 +128,26 @@ jobs:
         repo: open-eid/libdigidocpp
     - name: Install Deps
       run: dnf install -y ./libdigidocpp-pkg/*.rpm git gcc-c++ cmake rpm-build gettext openssl-devel openldap-devel pcsc-lite-devel qt6-qtsvg-devel qt6-qttools-devel flatbuffers-devel flatbuffers-compiler zlib-devel
-    - name: Checkout
-      uses: actions/checkout@v5
-      with:
-        submodules: recursive
+    - *Checkout
     - name: Build
       run: |
         cmake -DCMAKE_INSTALL_PREFIX=/usr -B build -S .
         cmake --build build --target all package
     - name: Archive artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: fedora_${{ matrix.container }}
         path: build/qdigidoc4*.rpm
   windows:
     name: Build on Windows
-    runs-on: windows-2022
+    runs-on: windows-2025
     strategy:
       matrix:
         vcver: [143]
     env:
       VER_SUFFIX: .VS${{ matrix.vcver }}
     steps:
-    - name: Checkout
-      uses: actions/checkout@v5
-      with:
-        submodules: recursive
+    - *Checkout
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v11
       with:
@@ -178,7 +176,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.9.2
+        version: 6.10.1
         arch: win64_msvc2022_64
     - name: Setup dev env
       uses: ilammy/msvc-dev-cmd@v1
@@ -196,7 +194,7 @@ jobs:
         cmake --build build --target msishellext
         cmake --build build --target appx
     - name: Archive artifacts
-      uses: actions/upload-artifact@v4
+      uses: actions/upload-artifact@v5
       with:
         name: msi_${{ matrix.vcver }}_x64
         path: |
@@ -210,10 +208,7 @@ jobs:
       TOKEN: ${{ secrets.COVERITY_SCAN_TOKEN }}
       PROJECTNAME: open-eid/DigiDoc4-Client
     steps:
-    - name: Checkout
-      uses: actions/checkout@v5
-      with:
-        submodules: recursive
+    - *Checkout
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v11
       with:
@@ -252,10 +247,7 @@ jobs:
     permissions:
       security-events: write
     steps:
-    - name: Checkout
-      uses: actions/checkout@v5
-      with:
-        submodules: recursive
+    - *Checkout
     - name: Download artifact
       uses: dawidd6/action-download-artifact@v11
       with:
@@ -267,14 +259,14 @@ jobs:
     - name: Install dependencies
       run: sudo apt update -qq && sudo apt install --no-install-recommends -y ${UBUNTU_DEPS}
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v4
       with:
         languages: cpp
         queries: +security-and-quality
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v4
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v4
       with:
         upload: False
         output: sarif-results
@@ -289,6 +281,6 @@ jobs:
         input: sarif-results/cpp.sarif
         output: sarif-results/cpp.sarif
     - name: Upload results
-      uses: github/codeql-action/upload-sarif@v3
+      uses: github/codeql-action/upload-sarif@v4
       with:
         sarif_file: sarif-results/cpp.sarif

CMakeLists.txt

@@ -2,7 +2,10 @@ cmake_minimum_required(VERSION 3.22)
 if(NOT EXISTS ${CMAKE_SOURCE_DIR}/common/CMakeLists.txt)
     message(FATAL_ERROR "common submodule directory empty, did you 'git clone --recursive'?")
 endif()
-project(qdigidoc4 VERSION 4.9.0)
+project(qdigidoc4 VERSION 4.10.0
+    DESCRIPTION "DigiDoc4 application for digital signing and encryption"
+    HOMEPAGE_URL https://github.com/open-eid/DigiDoc4-Client
+)
 
 macro(SET_ENV NAME DEF)
     if(DEFINED ENV{${NAME}})
@@ -26,7 +29,7 @@ set(CMAKE_AUTOMOC ON)
 set(CMAKE_C_VISIBILITY_PRESET hidden)
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_VISIBILITY_INLINES_HIDDEN YES)
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO)

client/Application.cpp

@@ -118,7 +118,7 @@ class DigidocConf final: public digidoc::XmlConfCurrent
 
 	std::string logFile() const final
 	{
-		return log.value_or(digidoc::XmlConfCurrent::logFile());
+		return log.or_else([this] { return make_optional(digidoc::XmlConfCurrent::logFile()); }).value();
 	}
 
 	std::string proxyHost() const final
@@ -423,10 +423,10 @@ Application::Application( int &argc, char **argv )
 
 	// Actions
 	d->closeAction = new QAction( tr("Close Window"), this );
-	d->closeAction->setShortcut( Qt::CTRL + Qt::Key_W );
+	d->closeAction->setShortcut(Qt::CTRL | Qt::Key_W);
 	connect(d->closeAction, &QAction::triggered, this, &Application::closeWindow);
 	d->newClientAction = new QAction( tr("New Window"), this );
-	d->newClientAction->setShortcut( Qt::CTRL + Qt::Key_N );
+	d->newClientAction->setShortcut(Qt::CTRL | Qt::Key_N);
 	connect(d->newClientAction, &QAction::triggered, this, []{ showClient({}, false, false, true); });
 
 	// This is needed to release application from memory (Windows)

client/CMakeLists.txt

@@ -174,7 +174,7 @@ if( APPLE )
 	)
 	add_custom_target(macdeployqt DEPENDS ${PROJECT_NAME}
 		COMMAND Qt::macdeployqt $<TARGET_BUNDLE_DIR:${PROJECT_NAME}>
-		COMMAND rm -rf $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/bearer
+		COMMAND rm -rf $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/networkinformation
 		COMMAND cp -a /Library/Frameworks/digidocpp.framework $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks
 		COMMAND rm $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks/digidocpp.framework/Resources/digidoc-tool
 		COMMAND find $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/Frameworks -name Headers | xargs rm -rf