Skip to content

Commit

Permalink
Packaging: Updated snap to include xcb and (more) Qt dependencies
Browse files Browse the repository at this point in the history
Running works and seems to have access to system resources after
installing with

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

Issue #37
  • Loading branch information
pentix committed Oct 16, 2019
1 parent 7c73975 commit b8e18b3
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 3 deletions.
4 changes: 4 additions & 0 deletions packaging/snap/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
14 changes: 11 additions & 3 deletions packaging/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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

0 comments on commit b8e18b3

Please sign in to comment.