android-fix

zinuzoid · May 30, 2024 · cabc7b7 · cabc7b7
1 parent 92e171c
commit cabc7b7
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/.github/workflows/build-native.yml b/.github/workflows/build-native.yml
@@ -94,7 +94,8 @@ jobs:
             liblua5.4-dev \
             libxml-parser-perl \
             libasound2-dev \
-            libgles2-mesa-dev libegl1-mesa-dev
+            libgles2-mesa-dev libegl1-mesa-dev \
+            libnetcdf-dev
 
       - name: Compile XCSoar
         run: |

diff --git a/ide/provisioning/install-debian-packages.sh b/ide/provisioning/install-debian-packages.sh
@@ -99,6 +99,8 @@ apt-get install ${APTOPTS[*]} default-jdk-headless vorbis-tools adb libtool \
     unzip
 echo
 
+apt-get install libglm-dev libnetcdf-dev
+
 echo Clean up downloaded resources in order to free space
 apt-get clean
 echo
diff --git a/src/Weather/Skysight/Metrics.hpp b/src/Weather/Skysight/Metrics.hpp
@@ -63,9 +63,18 @@ struct SkysightActiveMetric {
   SkysightActiveMetric(SkysightMetric *_metric, uint64_t _from,
 		       uint64_t _to, uint64_t _mtime): 
     metric(_metric), from(_from), to(_to), mtime(_mtime) {}
+  ~SkysightActiveMetric() = default;
   SkysightActiveMetric(const SkysightActiveMetric &m):
     metric(m.metric), from(m.from), to(m.to), mtime(m.mtime),
     updating(m.updating) {}
+  SkysightActiveMetric& operator=(const SkysightActiveMetric &m) {
+    metric = m.metric;
+    from = m.from;
+    to = m.to;
+    mtime = m.mtime;
+    updating = m.updating;
+    return *this;
+  }
 };
 
 struct DisplayedMetric {