From b8e18b352c37381ae4293106e737bf7d3cb79639 Mon Sep 17 00:00:00 2001
From: Patrick Eigensatz <patrick.eigensatz@gmail.com>
Date: Wed, 16 Oct 2019 11:10:36 +0200
Subject: [PATCH] Packaging: Updated snap to include xcb and (more) Qt
 dependencies

Running works and seems to have access to system resources after
installing with

snap install --dangerous --devmode qjournalctl_0.6_amd64.snap

Issue #37
---
 packaging/snap/Makefile       |  4 ++++
 packaging/snap/snapcraft.yaml | 14 +++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packaging/snap/Makefile b/packaging/snap/Makefile
index e2646be..974e827 100644
--- a/packaging/snap/Makefile
+++ b/packaging/snap/Makefile
@@ -8,3 +8,7 @@ all:
 	docker cp snapcraft.yaml qjournalctl-snap:/snap/
 	docker exec -i qjournalctl-snap snapcraft
 	docker exec -i qjournalctl-snap bash -c 'cp /snap/*.snap /out'
+
+	docker stop qjournalctl-snap
+
+	RES=$(shell ls -lhsa *.snap) ; echo "Build succeeded: "$(RES)
diff --git a/packaging/snap/snapcraft.yaml b/packaging/snap/snapcraft.yaml
index 30368af..136fe64 100644
--- a/packaging/snap/snapcraft.yaml
+++ b/packaging/snap/snapcraft.yaml
@@ -6,12 +6,13 @@ description: |
   systemd's journalctl command
 
 base: core18
-confinement: classic
+confinement: devmode 
 
 parts:
   qjournalctl:
     plugin: qmake
     qt-version: qt5
+    after: [desktop-qt5]
     
     source-type: tar
     source: https://github.com/pentix/qjournalctl/archive/v0.6.tar.gz
@@ -27,7 +28,8 @@ parts:
         make install -j$(nproc)
         
         cd ../..
-        
+
+        sed -i 's/target.path = \/usr\/bin/target.path = \/snap\/parts\/qjournalctl\/install\/usr\/bin/' qjournalctl.pro
         PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/snap/parts/qjournalctl/install/lib/pkgconfig/ QT_SELECT=qt5 qmake qjournalctl.pro -r -spec linux-g++ CONFIG+=release QMAKE_LIBDIR=/snap/parts/qjournalctl/install/lib/
 
         make install -j$(nproc)
@@ -42,11 +44,17 @@ parts:
       - cmake
       - wget
       - qtbase5-dev
+      - xcb
+      - libx11-xcb-dev
+      - libx11-xcb1
    
     stage-packages:
       - qtbase5-dev
+      - xcb
+      - libx11-xcb-dev
+      - libx11-xcb1
 
 apps:
   qjournalctl:
-    command: qjournalctl
+    command: desktop-launch qjournalctl