Update Qt 6.9.2 and OpenSSL 3.5.2

IB-8585

Signed-off-by: Raul Metsma <raul@metsma.ee>

Author: metsma

.github/workflows/build.yml

@@ -26,26 +26,36 @@ jobs:
         path: libdigidocpp-pkg
         repo: open-eid/libdigidocpp
     - name: Install dependencies
-      env:
-        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK: YES
       run: |
         brew install flatbuffers
-        HASH=($(shasum prepare_osx_build_environment.sh))
         curl -O -L -s https://installer.id.ee/media/github/opensc_0.26.1.pkg
-        curl -O -L -s https://installer.id.ee/media/github/${HASH}.zip
         sudo installer -verboseR -pkg libdigidocpp-pkg/build/macos/libdigidocpp*.pkg -target /
         sudo installer -verboseR -pkg opensc_*.pkg -target /
-        sudo unzip -qq -d /Library/Developer ${HASH}.zip
         rm -rf libdigidocpp-pkg
+    - name: Cache libraries
+      uses: actions/cache@v4
+      with:
+        path: cache
+        key: vcpkg-macOS-${{ hashFiles('prepare_osx_build_environment.sh') }}
+    - name: Build libraries
+      run: |
+        sudo mkdir -p cache/Qt-6.9.2-OpenSSL
+        sudo ./prepare_osx_build_environment.sh -p cache
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v4
+      with:
+        version: 6.9.2
+        arch: clang_64
     - name: Build
       run: |
-        QT_DIR=$(ls -d /Library/Developer/Qt-*-OpenSSL | tail -n 1)
         cmake "-GNinja" \
-          -DCMAKE_PREFIX_PATH=${QT_DIR} \
-          -DOPENSSL_ROOT_DIR=/Library/Developer/OpenSSL \
-          -DLDAP_ROOT=/Library/Developer/OpenLDAP \
+          -DOPENSSL_ROOT_DIR=${PWD}/cache/OpenSSL \
+          -DLDAP_ROOT=${PWD}/cache/OpenLDAP \
           -DCMAKE_OSX_ARCHITECTURES="x86_64;arm64" -B build -S .
-        cmake --build build --target zipdebug macdeployqt zip
+        cmake --build build
+        cmake --build build --target zipdebug
+        cmake --build build --target macdeployqt
+        cmake --build build --target zip
     - name: Archive artifacts
       uses: actions/upload-artifact@v4
       with:
@@ -150,25 +160,32 @@ jobs:
       run: |
         Rename-Item "libdigidocpp*.msi" libdigidocpp.msi
         msiexec /qn /i libdigidocpp.msi
+    - name: Cache vcpkg
+      uses: actions/cache@v4
+      with:
+        path: ${{ github.workspace }}/vcpkg_cache
+        key: vcpkg-${{ matrix.vcver }}-${{ hashFiles('.github/workflows/*', 'vcpkg.json') }}
     - name: Prepare vcpkg
-      uses: lukka/run-vcpkg@v7
+      uses: lukka/run-vcpkg@v11
       with:
-        vcpkgArguments: openssl zlib flatbuffers
-        vcpkgGitCommitId: 031ad89ce6c575df35a8e58707ad2c898446c63e
-        vcpkgTriplet: x64-windows
+        vcpkgGitCommitId: 98e7cd3a7ba579efc543f8854af800d033031eae
+        vcpkgJsonGlob: ./vcpkg.json
+        runVcpkgInstall: true
+      env:
+        VCPKG_BINARY_SOURCES: clear;files,${{ github.workspace }}/vcpkg_cache,readwrite
     - name: Install Qt
       uses: jurplel/install-qt-action@v4
       with:
-        version: 6.9.1
+        version: 6.9.2
         arch: win64_msvc2022_64
     - name: Setup dev env
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: x64
     - name: Install WiX
       run: |
-        dotnet tool install -g wix --version 6.0.1
-        wix extension -g add WixToolset.UI.wixext/6.0.1
+        dotnet tool install -g wix --version 6.0.2
+        wix extension -g add WixToolset.UI.wixext/6.0.2
     - name: Build
       run: |
         cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo `

client/CMakeLists.txt

@@ -34,6 +34,7 @@ add_executable(${PROJECT_NAME} WIN32 MACOSX_BUNDLE
 	${WIDGETS}
 	images/images.qrc
 	fonts/fonts.qrc
+	mac/Info.plist.cmake
 	common_enums.h
 	main.cpp
 	Application.cpp
@@ -160,16 +161,9 @@ foreach(SCHEMA ${SCHEMAS})
 endforeach()
 
 if( APPLE )
-	file(GLOB_RECURSE RESOURCE_FILES
-		${CMAKE_CURRENT_SOURCE_DIR}/mac/Resources/*.icns
-		${CMAKE_CURRENT_SOURCE_DIR}/mac/Resources/*.strings)
-	foreach(_file ${RESOURCE_FILES})
-		get_filename_component(_file_dir ${_file} PATH)
-		file(RELATIVE_PATH _file_dir ${CMAKE_CURRENT_SOURCE_DIR}/mac ${_file_dir})
-		set_source_files_properties( ${_file} PROPERTIES MACOSX_PACKAGE_LOCATION ${_file_dir})
-	endforeach(_file)
-
+	file(GLOB RESOURCE_FILES mac/*.icns mac/*.lproj)
 	target_sources(${PROJECT_NAME} PRIVATE ${RESOURCE_FILES} Application_mac.mm MacMenuBar.cpp MacMenuBar.h dialogs/CertificateDetails_mac.mm)
+	set_source_files_properties(${RESOURCE_FILES} PROPERTIES MACOSX_PACKAGE_LOCATION Resources)
 	set_source_files_properties( Application_mac.mm dialogs/CertificateDetails_mac.mm PROPERTIES COMPILE_FLAGS "-fobjc-arc" )
 	set_source_files_properties( LdapSearch.cpp PROPERTIES COMPILE_FLAGS "-Wno-deprecated-declarations" )
 	target_link_libraries(${PROJECT_NAME} "-framework QuickLookUI" "-fobjc-arc")
@@ -180,7 +174,7 @@ if( APPLE )
 		COMMAND cp -a $<TARGET_BUNDLE_DIR:DigiDocQL> $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns
 	)
 	add_custom_target(macdeployqt DEPENDS ${PROJECT_NAME}
-		COMMAND ${qtCore_install_prefix}/macdeployqt $<TARGET_BUNDLE_DIR:${PROJECT_NAME}>
+		COMMAND Qt::macdeployqt $<TARGET_BUNDLE_DIR:${PROJECT_NAME}>
 		COMMAND rm -rf $<TARGET_BUNDLE_CONTENT_DIR:${PROJECT_NAME}>/PlugIns/bearer
 		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
@@ -289,7 +283,7 @@ elseif(WIN32)
 		COMMAND ${CMAKE_COMMAND} -E copy ${LIBS_PATH}/digidocpp.conf appx
 		COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_SOURCE_DIR}/Assets appx/Assets
 		COMMAND ${CMAKE_COMMAND} -E copy_directory ${LIBS_PATH}/schema appx/schema
-		COMMAND ${qtCore_install_prefix}/windeployqt --no-translations --no-compiler-runtime --no-patchqt --force-openssl
+		COMMAND Qt::windeployqt --no-translations --no-compiler-runtime --no-patchqt --force-openssl
 			--skip-plugin-types generic,networkinformation,iconengines --exclude-plugins qjpeg,qico,qgif,qcertonlybackend,qschannelbackend appx
 		COMMAND makeappx.exe pack -d appx -p ${MSI_FILE}.appx
 		# https://msdn.microsoft.com/en-us/library/windows/desktop/jj835832(v=vs.85).aspx