From ef0a6b7beea5a648991802f4520171379edceaeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Sawicz?= Date: Sat, 7 May 2022 11:56:01 +0200 Subject: [PATCH] [gha] refresh linux-snap.patch MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Sawicz --- .github/workflows/linux-snap.patch | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/.github/workflows/linux-snap.patch b/.github/workflows/linux-snap.patch index 67b270006..c74706001 100644 --- a/.github/workflows/linux-snap.patch +++ b/.github/workflows/linux-snap.patch @@ -1,38 +1,37 @@ --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml -@@ -32,6 +32,7 @@ parts: +@@ -35,6 +35,7 @@ parts: googlemaps: - source: git://github.com/Subsurface/googlemaps.git + source: https://github.com/Subsurface/googlemaps.git build-packages: + - ccache - wget override-pull: | snapcraftctl pull -@@ -75,6 +76,8 @@ parts: +@@ -78,6 +79,7 @@ parts: plugin: qmake - options: + qmake-parameters: - INCLUDEPATH+=QtHeaders -+ - QMAKE_CC=ccache gcc -+ - QMAKE_CXX=ccache g++ ++ - CONFIG+=ccache desktop-qt5: source: https://github.com/ubuntu/snapcraft-desktop-helpers.git -@@ -105,7 +108,11 @@ parts: +@@ -108,7 +110,11 @@ parts: source: . source-type: git source-subdir: libdivecomputer -+ configflags: -+ - CC=ccache gcc -+ - CXX=ccache g++ ++ autotools-configure-parameters: ++ - CC="ccache gcc" ++ - CXX="ccache g++" build-packages: + - ccache - libbluetooth-dev - libhidapi-dev - libusb-dev -@@ -127,9 +134,12 @@ parts: - - -DLIBGIT2_DYNAMIC=ON +@@ -131,9 +137,12 @@ parts: - -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_CXX_COMPILER_LAUNCHER=ccache source-type: git