From 0b98c1a4280416006a5a36c1478a67ed2cc8f726 Mon Sep 17 00:00:00 2001 From: Patrick Eigensatz Date: Mon, 21 Oct 2019 00:58:59 +0200 Subject: [PATCH] Packaging: Snap: Copy pixmaps/.desktop file separately The previous attempt did not work out, see build log. This reverts commit 8f939d96bdc68fdc6d5ec2f4af78afa326431649. Issue #37 --- packaging/snap/snapcraft.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packaging/snap/snapcraft.yaml b/packaging/snap/snapcraft.yaml index 9a30bb7..c5d32c4 100644 --- a/packaging/snap/snapcraft.yaml +++ b/packaging/snap/snapcraft.yaml @@ -30,13 +30,16 @@ parts: cd ../.. sed -i 's/target.path = \/usr\/bin/target.path = \/snap\/parts\/qjournalctl\/install\/usr\/bin/' qjournalctl.pro - sed -i 's/desktop-file.path = \/usr\/share\/applications/desktop-file.path = \/snap\/prime\/usr\/share\/applications/' qjournalctl.pro - sed -i 's/desktop-icon.path = \/usr\/share\/pixmaps/desktop-icon.path = \/snap\/prime\/usr\/share\/pixmaps/' qjournalctl.pro + sed -i 's/desktop-file.path = \/usr\/share\/applications/desktop-file.path = \/snap\/parts\/qjournalctl\/install\/usr\/share\/applications/' qjournalctl.pro + sed -i 's/desktop-icon.path = \/usr\/share\/pixmaps/desktop-icon.path = \/snap\/parts\/qjournalctl\/install\/usr\/share\/pixmaps/' 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) + + cp /snap/parts/qjournalctl/install/usr/share/applications/qjournalctl.desktop /snap/prime/usr/share/applications/ + cp /snap/parts/qjournalctl/install/usr/share/pixmaps/qjournalctl.png /snap/prime/usr/share/pixmaps/ + build-packages: - build-essential