mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

[snap] refresh for core20 and add Wayland support

Browse source 
Signed-off-by: Michał Sawicz <michal@sawicz.net>
This commit is contained in:
Michał Sawicz 2022-05-07 11:49:42 +02:00 • committed by Dirk Hohndel
parent 34b61ad288
commit c7242a37be
1 changed files with 21 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
snap/snapcraft.yaml
View file

@ -1,7 +1,5 @@
name: subsurface name: subsurface
version: git adopt-info: subsurface
version-script: |
git describe
icon: icons/subsurface-icon.svg icon: icons/subsurface-icon.svg
summary: Open source divelog program for recreational, tech, and free-divers summary: Open source divelog program for recreational, tech, and free-divers
description: | description: |
@ -13,12 +11,16 @@ description: |
grade: stable grade: stable
confinement: strict confinement: strict
base: core18 base: core20
apps: apps:
subsurface: subsurface:
command: desktop-launch $SNAP/bin/subsurface environment:
desktop: share/applications/subsurface.desktop LD_LIBRARY_PATH: ${SNAP}/usr/local/lib
command-chain:
- bin/desktop-launch
command: usr/local/bin/subsurface
desktop: usr/local/share/applications/subsurface.desktop
plugs: plugs:
- bluez - bluez
- home - home
@ -27,6 +29,7 @@ apps:
- raw-usb - raw-usb
- removable-media - removable-media
- unity7 - unity7
- wayland
parts: parts:
googlemaps: googlemaps:
@ -73,7 +76,7 @@ parts:
http://code.qt.io/cgit/qt/qtlocation.git/plain/src/positioning/${HEADER}_p.h?h=v${QT_VERSION} http://code.qt.io/cgit/qt/qtlocation.git/plain/src/positioning/${HEADER}_p.h?h=v${QT_VERSION}
done done
plugin: qmake plugin: qmake
options: qmake-parameters:
- INCLUDEPATH+=QtHeaders - INCLUDEPATH+=QtHeaders
desktop-qt5: desktop-qt5:
@ -122,11 +125,12 @@ parts:
source: . source: .
after: [desktop-qt5, googlemaps, libdc] after: [desktop-qt5, googlemaps, libdc]
plugin: cmake plugin: cmake
configflags: cmake-parameters:
- -DMAKE_TESTS=OFF - -DMAKE_TESTS=OFF
- -DLIBGIT2_DYNAMIC=ON - -DLIBGIT2_DYNAMIC=ON
- -DFTDISUPPORT=ON - -DFTDISUPPORT=ON
- -DLIBDIVECOMPUTER_LIBRARIES=../../../stage/lib/libdivecomputer.so - -DLIBDIVECOMPUTER_LIBRARIES=../../../stage/usr/local/lib/libdivecomputer.so
- -DLIBDIVECOMPUTER_INCLUDE_DIR=../../../stage/usr/local/include
source-type: git source-type: git
build-packages: build-packages:
- build-essential - build-essential
@ -140,13 +144,16 @@ parts:
- libssh2-1-dev - libssh2-1-dev
- libssl-dev - libssl-dev
- libxml2-dev - libxml2-dev
- libxslt-dev - libxslt1-dev
- libzip-dev - libzip-dev
- pkg-config - pkg-config
- qtconnectivity5-dev - qtconnectivity5-dev
- qtlocation5-dev - qtlocation5-dev
- qtpositioning5-dev - qtpositioning5-dev
- qttools5-dev - qttools5-dev
override-pull: |
snapcraftctl pull
snapcraftctl set-version $( git describe )
override-build: | override-build: |
mkdir -p ../install-root mkdir -p ../install-root
ln -sf ../../../stage/usr/lib/*/qt5/plugins/geoservices/libqtgeoservices_googlemaps.so \ ln -sf ../../../stage/usr/lib/*/qt5/plugins/geoservices/libqtgeoservices_googlemaps.so \
@ -158,7 +165,7 @@ parts:
- libcurl3-gnutls - libcurl3-gnutls
- libdb5.3 - libdb5.3
- libftdi1-2 - libftdi1-2
- libgit2-26 - libgit2-28
- libqt5bluetooth5 - libqt5bluetooth5
- libqt5charts5 - libqt5charts5
- libqt5concurrent5 - libqt5concurrent5
@ -176,12 +183,13 @@ parts:
- libqt5widgets5 - libqt5widgets5
- libsqlite3-0 - libsqlite3-0
- libssh2-1 - libssh2-1
- libssl1.0.0 - libssl1.1
- libusb-1.0-0 - libusb-1.0-0
- libxml2 - libxml2
- libxslt1.1 - libxslt1.1
- libzip4 - libzip5
- qml-module-qtlocation - qml-module-qtlocation
- qml-module-qtpositioning - qml-module-qtpositioning
- qml-module-qtquick2 - qml-module-qtquick2
- qtwayland5
- zlib1g - zlib1g