~ruther/guix-local

7506e7ef68f52c2a27f550e283545824b7e370dc — Florian Pelz 6 months ago aabe0d2
gnu: schiffbruch: Fix build with GCC 14.

* gnu/packages/patches/schiffbruch-fix-build-for-gcc-13.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/games.scm (schiffbruch): Apply it.

Change-Id: I539c749e57323dc305a022066d3b07de1cf5ec1d
Reviewed-by: Andreas Enge <andreas@enge.fr>
M gnu/local.mk => gnu/local.mk +1 -0
@@ 2059,6 2059,7 @@ dist_patch_DATA =						\
  %D%/packages/patches/qtlocation-5.15.8-mapboxgl-gcc13.patch	\
  %D%/packages/patches/quodlibet-disable-bundled-packages.patch	\
  %D%/packages/patches/qxlsx-fix-include-directory.patch	\
  %D%/packages/patches/schiffbruch-fix-build-for-gcc-13.patch	\
  %D%/packages/patches/scn-fast-float-compat.patch		\
  %D%/packages/patches/sdcc-disable-non-free-code.patch		\
  %D%/packages/patches/sdl-pango-api_additions.patch		\

M gnu/packages/games.scm => gnu/packages/games.scm +2 -1
@@ 12795,7 12795,8 @@ to start over several times to find the most satisfactory ending.")
               (commit commit)))
         (file-name (git-file-name name version))
         (sha256
          (base32 "0lg3rqacrapf6c4sxi12cm9bmg43mlbclway1zxcm848pi1xkzwv"))))
          (base32 "0lg3rqacrapf6c4sxi12cm9bmg43mlbclway1zxcm848pi1xkzwv"))
         (patches (search-patches "schiffbruch-fix-build-for-gcc-13.patch"))))
      (build-system cmake-build-system)
      (arguments
       `(#:tests? #f                              ; no tests

A gnu/packages/patches/schiffbruch-fix-build-for-gcc-13.patch => gnu/packages/patches/schiffbruch-fix-build-for-gcc-13.patch +39 -0
@@ 0,0 1,39 @@
Submitted as pull request <https://github.com/sandsmark/Schiffbruch/pull/1>.

From: Florian Pelz <pelzflorian@pelzflorian.de>
Date: Wed, 24 Sep 2025 10:24:24 +0200
Subject: [PATCH] fix build for gcc 13

---
 src/Renderer.cpp | 3 ++-
 src/types.hpp    | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/Renderer.cpp b/src/Renderer.cpp
index d3339e2..93d472c 100644
--- a/src/Renderer.cpp
+++ b/src/Renderer.cpp
@@ -202,6 +202,8 @@ RGBSTRUCT GetPixel(short x, short y, sf::Image *img)
 //    DWORD pitch = ddsd->lPitch >> 1;
 //    DWORD color = pixels[y * pitch + x * 2];
 
+    RGBSTRUCT rgbStruct;
+
     // TODO: more efficient
     if (x < 0 || y < 0 || x >= int(img->getSize().x) || y >= int(img->getSize().y)) {
         rgbStruct.r = 0;
diff --git a/src/types.hpp b/src/types.hpp
index 2034966..fd1882d 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -3,6 +3,7 @@
 #include "headers.hpp"
 //#include "miniwin.h"
 
+#include <cstdint>
 #include <SFML/Graphics/Texture.hpp>
 
 namespace Action {
-- 
2.51.0