mirror of
https://github.com/subsurface/subsurface.git
synced 2024-12-02 23:20:20 +00:00
[gha] refresh linux-snap.patch
Signed-off-by: Michał Sawicz <michal@sawicz.net>
This commit is contained in:
parent
c7242a37be
commit
ef0a6b7bee
1 changed files with 12 additions and 13 deletions
25
.github/workflows/linux-snap.patch
vendored
25
.github/workflows/linux-snap.patch
vendored
|
@ -1,38 +1,37 @@
|
||||||
--- a/snap/snapcraft.yaml
|
--- a/snap/snapcraft.yaml
|
||||||
+++ b/snap/snapcraft.yaml
|
+++ b/snap/snapcraft.yaml
|
||||||
@@ -32,6 +32,7 @@ parts:
|
@@ -35,6 +35,7 @@ parts:
|
||||||
googlemaps:
|
googlemaps:
|
||||||
source: git://github.com/Subsurface/googlemaps.git
|
source: https://github.com/Subsurface/googlemaps.git
|
||||||
build-packages:
|
build-packages:
|
||||||
+ - ccache
|
+ - ccache
|
||||||
- wget
|
- wget
|
||||||
override-pull: |
|
override-pull: |
|
||||||
snapcraftctl pull
|
snapcraftctl pull
|
||||||
@@ -75,6 +76,8 @@ parts:
|
@@ -78,6 +79,7 @@ parts:
|
||||||
plugin: qmake
|
plugin: qmake
|
||||||
options:
|
qmake-parameters:
|
||||||
- INCLUDEPATH+=QtHeaders
|
- INCLUDEPATH+=QtHeaders
|
||||||
+ - QMAKE_CC=ccache gcc
|
+ - CONFIG+=ccache
|
||||||
+ - QMAKE_CXX=ccache g++
|
|
||||||
|
|
||||||
desktop-qt5:
|
desktop-qt5:
|
||||||
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
|
source: https://github.com/ubuntu/snapcraft-desktop-helpers.git
|
||||||
@@ -105,7 +108,11 @@ parts:
|
@@ -108,7 +110,11 @@ parts:
|
||||||
source: .
|
source: .
|
||||||
source-type: git
|
source-type: git
|
||||||
source-subdir: libdivecomputer
|
source-subdir: libdivecomputer
|
||||||
+ configflags:
|
+ autotools-configure-parameters:
|
||||||
+ - CC=ccache gcc
|
+ - CC="ccache gcc"
|
||||||
+ - CXX=ccache g++
|
+ - CXX="ccache g++"
|
||||||
build-packages:
|
build-packages:
|
||||||
+ - ccache
|
+ - ccache
|
||||||
- libbluetooth-dev
|
- libbluetooth-dev
|
||||||
- libhidapi-dev
|
- libhidapi-dev
|
||||||
- libusb-dev
|
- libusb-dev
|
||||||
@@ -127,9 +134,12 @@ parts:
|
@@ -131,9 +137,12 @@ parts:
|
||||||
- -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
|
||||||
+ - -DCMAKE_C_COMPILER_LAUNCHER=ccache
|
+ - -DCMAKE_C_COMPILER_LAUNCHER=ccache
|
||||||
+ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
|
+ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache
|
||||||
source-type: git
|
source-type: git
|
||||||
|
|
Loading…
Reference in a new issue