Latest DigiDoc/CDoc

Author: Lauris Kaplinski

.github/workflows/build.yml

@@ -5,7 +5,7 @@ permissions:
 env:
   BUILD_NUMBER: ${{ github.run_number }}
   CMAKE_BUILD_PARALLEL_LEVEL: 4
-  UBUNTU_DEPS: ./libdigidocpp-pkg/*.deb cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev zlib1g-dev
+  UBUNTU_DEPS: ./libdigidocpp-pkg/*.deb cmake libldap2-dev gettext libpcsclite-dev libssl-dev libgl-dev libqt6svg6-dev qt6-tools-dev qt6-tools-dev-tools qt6-l10n-tools libflatbuffers-dev libxml2-dev zlib1g-dev
 jobs:
   macos:
     name: Build on macOS
@@ -154,7 +154,7 @@ jobs:
         Rename-Item "libdigidocpp*.msi" libdigidocpp.msi
         msiexec /qn /i libdigidocpp.msi
     - name: Prepare vcpkg
-      uses: lukka/run-vcpkg@v7
+      uses: lukka/run-vcpkg@v11
       with:
         vcpkgArguments: openssl zlib flatbuffers
         vcpkgGitCommitId: 4008642a50a01a7115c2406b04d5273898e7fe1c
@@ -173,9 +173,10 @@ jobs:
         dotnet tool install -g wix --version 5.0.2
         wix extension -g add WixToolset.UI.wixext/5.0.2
     - name: Build
+      env:
+        VCPKG_MANIFEST_DIR: ${{ github.workspace }}/client/libcdoc
       run: |
-        cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo `
-          -DCMAKE_TOOLCHAIN_FILE=${{ env.RUNVCPKG_VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake
+        cmake "-GNinja" -B build -S . -DCMAKE_BUILD_TYPE=RelWithDebInfo "-DCMAKE_TOOLCHAIN_FILE=${{ env.VCPKG_ROOT }}/scripts/buildsystems/vcpkg.cmake" -DVCPKG_MANIFEST_DIR=${{ github.workspace }}/client/libcdoc
         cmake --build build --target msi
         cmake --build build --target msishellext
         cmake --build build --target appx

.gitmodules

@@ -1,3 +1,6 @@
 [submodule "common"]
 	path = common
 	url = ../qt-common
+[submodule "client/libcdoc"]
+	path = client/libcdoc
+	url = git@github.com:open-eid/libcdoc.git

CMakeLists.txt

@@ -30,10 +30,6 @@ set(CMAKE_CXX_STANDARD 20)
 set(CMAKE_CXX_STANDARD_REQUIRED YES)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION YES)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION_DEBUG NO)
-if(CMAKE_CXX_COMPILER_ID MATCHES "AppleClang")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-object_path_lto,lto.o")
-    set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-object_path_lto,lto.o")
-endif()
 set(CPACK_PACKAGE_VERSION ${VERSION})
 set(CPACK_GENERATOR RPM)
 set(CPACK_PACKAGE_CONTACT "RIA <info@ria.ee>")
@@ -48,8 +44,6 @@ find_package(libdigidocpp 4.2.0 REQUIRED HINTS /Library)
 message("-- Found libdigidocpp: ${libdigidocpp_DIR} (found version \"${libdigidocpp_VERSION}\")")
 find_package(LDAP REQUIRED)
 find_package(Qt6 6.2.0 REQUIRED COMPONENTS Core Widgets Network PrintSupport SvgWidgets LinguistTools)
-find_package(FlatBuffers CONFIG REQUIRED NAMES FlatBuffers Flatbuffers)
-find_package(ZLIB REQUIRED)
 
 if(APPLE)
     add_subdirectory(extensions/DigiDocQL)

client/Application.cpp

@@ -23,6 +23,7 @@
 
 #include "Common.h"
 #include "Configuration.h"
+#include "CDocSupport.h"
 #include "MainWindow.h"
 #include "QSigner.h"
 #include "QSmartCard.h"
@@ -462,6 +463,7 @@ Application::Application( int &argc, char **argv )
 		setQuitOnLastWindowClosed( true );
 		return;
 	}
+	DDCDocLogger::setUpLogger();
 
 	QMetaObject::invokeMethod(this, [this] {
 #ifdef Q_OS_MAC