From 9fdbc2fb104954793aaf69e521cf92bcfc24d9b1 Mon Sep 17 00:00:00 2001 From: Raul Metsma Date: Tue, 21 Apr 2026 10:24:12 +0300 Subject: [PATCH] Update libraries * OpenSSL 3.5.6 * OpenLDAP 2.6.13 * Qt 6.11.1 Signed-off-by: Raul Metsma --- .github/workflows/build.yml | 31 +++++++++++++++++-------------- CMakeLists.txt | 5 ++++- COPYING | 25 ------------------------- README.md | 4 ++-- RELEASE-NOTES.md | 6 ++++++ prepare_osx_build_environment.sh | 6 +++--- 6 files changed, 32 insertions(+), 45 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index dcd5c2a1a..51bda5bdb 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -41,12 +41,12 @@ jobs: key: vcpkg-macOS-${{ hashFiles('prepare_osx_build_environment.sh') }} - name: Build libraries run: | - mkdir -p ${LIBS_PATH}/Qt-6.10.2-OpenSSL + mkdir -p ${LIBS_PATH}/Qt-6.11.1-OpenSSL ./prepare_osx_build_environment.sh -p ${LIBS_PATH} - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 + version: 6.11.1 arch: clang_64 cache: true - name: Build @@ -116,7 +116,7 @@ jobs: container: fedora:${{ matrix.container }} strategy: matrix: - container: [42, 43, 44] + container: [43, 44] steps: - name: Download artifact uses: dawidd6/action-download-artifact@v20 @@ -140,7 +140,7 @@ jobs: path: build/qdigidoc4*.rpm windows: name: Build on Windows - runs-on: ${{ matrix.platform == 'arm64' && 'windows-11-arm' || 'windows-2025' }} + runs-on: windows-2022 strategy: matrix: vcver: [143] @@ -160,7 +160,8 @@ jobs: - name: Install artifact run: | Rename-Item "libdigidocpp*.msi" libdigidocpp.msi - msiexec /qn /i libdigidocpp.msi + $r = Start-Process msiexec -ArgumentList '/a', 'libdigidocpp.msi', '/qn', "TARGETDIR=$env:GITHUB_WORKSPACE\libs", '/l*v', 'install.log' -Wait -PassThru + if ($r.ExitCode -ne 0) { Get-Content install.log; exit $r.ExitCode } - name: Cache vcpkg uses: actions/cache@v5 with: @@ -169,24 +170,26 @@ jobs: - name: Install Qt uses: jurplel/install-qt-action@v4 with: - version: 6.10.2 - arch: ${{ matrix.platform == 'arm64' && 'win64_msvc2022_arm64' || 'win64_msvc2022_64' }} + version: 6.11.1 + arch: ${{ matrix.platform == 'arm64' && 'win64_msvc2022_arm64_cross_compiled' || 'win64_msvc2022_64' }} cache: true - - name: Setup dev env - uses: ilammy/msvc-dev-cmd@v1 - with: - arch: ${{ matrix.platform }} + aqtsource: git+https://github.com/miurahr/aqtinstall.git - name: Install WiX run: | dotnet tool install -g wix --version 6.0.2 wix extension -g add WixToolset.UI.wixext/6.0.2 - name: Build + shell: cmd env: VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite run: | - cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo ` - -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ` - -DVCPKG_MANIFEST_DIR=${{ github.workspace }}/client/libcdoc + for /f "usebackq tokens=*" %%i in (`"%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\vswhere.exe" -latest -find VC\Auxiliary\Build\vcvarsall.bat`) do call "%%i" ${{ matrix.platform == 'arm64' && 'amd64_arm64' || 'amd64' }} + set QT_HOST_PATH=%QT_HOST_PATH:\=/% + cmake -GNinja -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo ^ + -DCMAKE_TOOLCHAIN_FILE=C:/vcpkg/scripts/buildsystems/vcpkg.cmake ^ + -DVCPKG_MANIFEST_DIR=${{ github.workspace }}/client/libcdoc ^ + -Dlibdigidocpp_ROOT=${{ github.workspace }}/libs/PFiles64 ^ + ${{ matrix.platform == 'arm64' && '-DQT_HOST_PATH=%QT_HOST_PATH%' || '' }} cmake --build build --target msi cmake --build build --target msishellext cmake --build build --target appx diff --git a/CMakeLists.txt b/CMakeLists.txt index b7c425aff..b943bbb43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2,7 +2,7 @@ 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.10.0 +project(qdigidoc4 VERSION 4.11.0 DESCRIPTION "DigiDoc4 application for digital signing and encryption" HOMEPAGE_URL https://github.com/open-eid/DigiDoc4-Client ) @@ -33,6 +33,9 @@ set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED YES) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES) set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO) +set(CMAKE_DISABLE_FIND_PACKAGE_Boost ON) +set(CMAKE_DISABLE_FIND_PACKAGE_Doxygen ON) +set(CMAKE_DISABLE_FIND_PACKAGE_SWIG ON) set(CPACK_PACKAGE_VERSION ${VERSION}) set(CPACK_GENERATOR RPM) set(CPACK_PACKAGE_CONTACT "RIA ") diff --git a/COPYING b/COPYING index 415d5c33c..cfe0d3216 100644 --- a/COPYING +++ b/COPYING @@ -264,28 +264,3 @@ client/fonts WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License. - -_______________________________________________________________________________ -schema - -MIT License - -Copyright (c) 2023 Open Electronic Identity - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/README.md b/README.md index 46468db21..4f2c6db8f 100644 --- a/README.md +++ b/README.md @@ -64,7 +64,7 @@ 3. Configure cmake -B build -S . \ - -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.10.2-OpenSSL + -DCMAKE_PREFIX_PATH=~/cmake_builds/Qt-6.11.1-OpenSSL \ -DOPENSSL_ROOT_DIR=~/cmake_build/OpenSSL \ -DLDAP_ROOT=~/cmake_build/OpenLDAP \ -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" @@ -95,7 +95,7 @@ 3. Configure cmake -G"NMAKE Makefiles" -B build -S . ` - -DCMAKE_PREFIX_PATH=C:\Qt\6.10.2\msvc2022_x64 ` + -DCMAKE_PREFIX_PATH=C:\Qt\6.11.1\msvc2022_64 ` -DLibDigiDocpp_ROOT="C:\Program Files (x86)\libdigidocpp" ` -DVCPKG_MANIFEST_DIR=client/libcdoc diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md index 0018f5a61..9794bc3a5 100644 --- a/RELEASE-NOTES.md +++ b/RELEASE-NOTES.md @@ -1,3 +1,9 @@ +DigiDoc4 version [4.10.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.10.0) release notes +-------------------------------------- +- Code, Text and translation improvements and updates + +[Full Changelog](https://github.com/open-eid/DigiDoc4-Client/compare/v4.9.0...v4.10.0) + DigiDoc4 version [4.9.0](https://github.com/open-eid/DigiDoc4-Client/releases/tag/v4.9.0) release notes -------------------------------------- - Code, Text and translation improvements and updates diff --git a/prepare_osx_build_environment.sh b/prepare_osx_build_environment.sh index b869639e4..5edd741d1 100755 --- a/prepare_osx_build_environment.sh +++ b/prepare_osx_build_environment.sh @@ -4,9 +4,9 @@ set -e ######### Versions of libraries/frameworks to be compiled -QT_VER="6.10.2" -OPENSSL_VER="3.5.5" -OPENLDAP_VER="2.6.12" +QT_VER="6.11.1" +OPENSSL_VER="3.5.6" +OPENLDAP_VER="2.6.13" REBUILD=false BUILD_PATH=~/cmake_builds : ${MACOSX_DEPLOYMENT_TARGET:="13.0"}