Skip to content

Commit

Permalink
Packaging: Snap: Copy pixmaps/.desktop file separately
Browse files Browse the repository at this point in the history
The previous attempt did not work out, see build log.
This reverts commit 8f939d9.

Issue #37
  • Loading branch information
pentix committed Oct 20, 2019
1 parent 8f939d9 commit 0b98c1a
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions packaging/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0b98c1a

Please sign in to comment.