From 2b9ea79e776f943f95d4cf948ca2266d419ccd2f Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
Date: Thu, 23 Jan 2025 12:45:14 +0100
Subject: snap: Updated to core24

---
 .github/workflows/packages.yml | 1 +
 snap/snapcraft.yaml            | 7 +++++--
 src/openglgraphics.cpp         | 2 ++
 src/sdlgraphics.cpp            | 2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/packages.yml b/.github/workflows/packages.yml
index 779491ae..1c124dd0 100644
--- a/.github/workflows/packages.yml
+++ b/.github/workflows/packages.yml
@@ -46,6 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
         with:
+          fetch-depth: 0 # required to generate the version from git tags
           submodules: true
 
       - uses: snapcore/action-build@v1
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 34e3d36c..711552fa 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -1,7 +1,6 @@
 name: mana
-version: git
 adopt-info: mana
-base: core22
+base: core24
 
 grade: stable
 confinement: strict
@@ -32,9 +31,13 @@ parts:
     parse-info:
       - usr/share/metainfo/org.manasource.Mana.metainfo.xml
     source: .
+    override-pull: |
+      craftctl default
+      craftctl set version=$(git describe --tags | sed 's/v//')
     build-packages:
       - build-essential
       - gettext
+      - git
       - libcurl4-openssl-dev
       - libguichan-dev
       - libphysfs-dev
diff --git a/src/openglgraphics.cpp b/src/openglgraphics.cpp
index cb242ff7..253cc1d2 100644
--- a/src/openglgraphics.cpp
+++ b/src/openglgraphics.cpp
@@ -34,6 +34,8 @@
 
 #include <SDL.h>
 
+#include <cmath>
+
 #ifndef GL_TEXTURE_RECTANGLE_ARB
 #define GL_TEXTURE_RECTANGLE_ARB 0x84F5
 #define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8
diff --git a/src/sdlgraphics.cpp b/src/sdlgraphics.cpp
index 37643190..44e89222 100644
--- a/src/sdlgraphics.cpp
+++ b/src/sdlgraphics.cpp
@@ -28,6 +28,8 @@
 
 #include <guichan/exception.hpp>
 
+#include <cmath>
+
 std::unique_ptr<Graphics> SDLGraphics::create(SDL_Window *window, const VideoSettings &settings)
 {
     int rendererFlags = 0;
-- 
cgit v1.2.3-70-g09d2