diff options
| author |  Michał Sawicz <michal@sawicz.net> | 2018-06-06 13:39:26 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2018-06-13 08:31:19 -0700 |
| commit | 0ab5ffc9d6e24dc02bef72dd36f4be6efc698682 (patch) | |
| tree | e0c53a1f402d543f13e44e7f0eaebf8916b43ecb | |
| parent | 5d6225cb8c17395317b742fe90fae001a78527cd (diff) | |
| download | subsurface-0ab5ffc9d6e24dc02bef72dd36f4be6efc698682.tar.gz | |
[snap] update to base on core18
Signed-off-by: Michał Sawicz <michal@sawicz.net>
| -rw-r--r-- | snap/snapcraft.yaml | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 4df6f8717..a374ed3dc 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -13,6 +13,7 @@ description: | grade: stable confinement: strict +base: core18 apps: subsurface: @@ -37,15 +38,17 @@ parts: mkdir -p QtHeaders/QtLocation/private QtHeaders/QtPositioning/private cd QtHeaders/QtLocation/private for HEADER in \ + qlocationglobal \ + maps/qabstractgeotilecache \ maps/qcache3q \ maps/qgeocameracapabilities \ maps/qgeocameradata \ maps/qgeomap \ - maps/qgeomapcontroller \ maps/qgeomappingmanager \ maps/qgeomappingmanagerengine \ maps/qgeomaptype \ - maps/qgeotilecache \ + maps/qgeofiletilecache \ + maps/qgeoprojection \ maps/qgeotiledmap \ maps/qgeotiledmappingmanagerengine \ maps/qgeotiledmapreply \ @@ -59,8 +62,10 @@ parts: cd - cd QtHeaders/QtPositioning/private for HEADER in \ + qdoublematrix4x4 \ qdoublevector2d \ - qgeoprojection + qdoublevector3d \ + qpositioningglobal do wget --no-verbose --content-disposition \ http://code.qt.io/cgit/qt/qtlocation.git/plain/src/positioning/${HEADER}_p.h?h=v${QT_VERSION} @@ -112,7 +117,7 @@ parts: - qtconnectivity5-dev - qtlocation5-dev - qtpositioning5-dev - - qttools5-dev-tools + - qttools5-dev override-build: | mkdir -p ../install-root ln -sf ../../../stage/usr/lib/*/qt5/plugins/geoservices/libqtgeoservices_googlemaps.so \ @@ -120,9 +125,11 @@ parts: sed -i 's@^Icon=.*@Icon=${SNAP}/share/icons/hicolor/scalable/apps/subsurface-icon.svg@' ../src/subsurface.desktop snapcraftctl build stage-packages: + - libcap2 - libcurl3-gnutls + - libdb5.3 - libftdi1-2 - - libgit2-24 + - libgit2-26 - libgrantlee-templates5 - libqt5bluetooth5 - libqt5concurrent5 |