This is an automated email from the git hooks/post-receive script.
guix_mirror_bot pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 7506e7ef68 gnu: schiffbruch: Fix build with GCC 14.
7506e7ef68 is described below
commit 7506e7ef68f52c2a27f550e283545824b7e370dc
Author: Florian Pelz <[email protected]>
AuthorDate: Wed Sep 24 11:44:45 2025 +0200
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 <[email protected]>
---
gnu/local.mk | 1 +
gnu/packages/games.scm | 3 +-
.../patches/schiffbruch-fix-build-for-gcc-13.patch | 39 ++++++++++++++++++++++
3 files changed, 42 insertions(+), 1 deletion(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index be82cf4219..a111f02805 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -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 \
diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm
index feba1a230c..738f274324 100644
--- a/gnu/packages/games.scm
+++ b/gnu/packages/games.scm
@@ -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
diff --git a/gnu/packages/patches/schiffbruch-fix-build-for-gcc-13.patch
b/gnu/packages/patches/schiffbruch-fix-build-for-gcc-13.patch
new file mode 100644
index 0000000000..0cc87b2a90
--- /dev/null
+++ b/gnu/packages/patches/schiffbruch-fix-build-for-gcc-13.patch
@@ -0,0 +1,39 @@
+Submitted as pull request <https://github.com/sandsmark/Schiffbruch/pull/1>.
+
+From: Florian Pelz <[email protected]>
+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
+
