From 039a27c30e299effd11ac15cede520c2dde33f12 Mon Sep 17 00:00:00 2001
From: Raul Metsma <raul@metsma.ee>
Date: Tue, 5 Jul 2022 11:14:23 +0300
Subject: [PATCH] Build Snapcraft packages from source and libdigidocpp

IB-7219

Signed-off-by: Raul Metsma <raul@metsma.ee>
---
 .github/workflows/build.yml |  2 ++
 snapcraft.yaml              | 27 +++++++++++++++++----------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ac651918b..6710fa0b2 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -208,6 +208,8 @@ jobs:
       with:
         submodules: recursive
     - uses: snapcore/action-build@v1
+    - name: Cat logs
+      run: cat /home/runner/.local/state/snapcraft/log/snapcraft*.log
     - name: Archive artifacts
       uses: actions/upload-artifact@v3
       with:
diff --git a/snapcraft.yaml b/snapcraft.yaml
index 4261bd130..2cdeeabda 100644
--- a/snapcraft.yaml
+++ b/snapcraft.yaml
@@ -7,13 +7,13 @@ icon: client/images/Icon.svg
 grade: devel
 confinement: devmode
 
-package-repositories:
-  - type: apt
-    components: [main]
-    suites: [focal, jammy]
-    key-id: 16A4D8047F6FD921EE24D3F9E9AB214DC6C83D68
-    key-server: hkp://keyserver.ubuntu.com:80
-    url: https://installer.id.ee/media/ubuntu
+#package-repositories:
+#  - type: apt
+#    components: [main]
+#    suites: [focal, jammy]
+#    key-id: 16A4D8047F6FD921EE24D3F9E9AB214DC6C83D68
+#    key-server: hkp://keyserver.ubuntu.com:80
+#    url: https://installer.id.ee/media/ubuntu
 
 apps:
   qdigidoc4:
@@ -25,11 +25,18 @@ apps:
     command: usr/bin/digidoc-tool
 
 parts:
+  libdigidocpp:
+    plugin: cmake
+    source: https://github.com/open-eid/libdigidocpp.git
+    stage-packages: [libxalan-c112, libxerces-c3.2, libxml-security-c20]
+    build-packages: [g++, xxd, libxml-security-c-dev, libssl-dev, zlib1g-dev, xsdcxx]
+    cmake-parameters: [-DCMAKE_INSTALL_PREFIX=/usr, -DCMAKE_FIND_ROOT_PATH=/usr]
   qdigidoc4:
     plugin: cmake
     source: .
-    stage-packages: [opensc-pkcs11, libdigidocpp-tools]
-    build-packages: [libdigidocpp-dev, libssl-dev, libpcsclite-dev, libldap2-dev, libflatbuffers-dev, zlib1g-dev]
+    stage-packages: [opensc-pkcs11]
+    build-packages: [libssl-dev, libpcsclite-dev, libldap2-dev, libflatbuffers-dev]
+    after: [libdigidocpp]
     cmake-parameters:
       - -DCMAKE_INSTALL_PREFIX=/usr
-      - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current"
+      - "-DCMAKE_FIND_ROOT_PATH=/usr\\;/root/stage\\;/snap/kf5-5-110-qt-5-15-11-core22-sdk/current"