[staging-next] ace-of-penguins: fix build with gcc 15 (#474565)

2025-12-27 15:53:49 +00:00
parent e5399aa9db ed30cdfd8b
commit cfa9573644
2 changed files with 24 additions and 0 deletions
@@ -0,0 +1,22 @@
+diff --git a/lib/table.c b/lib/table.c
+index befe696..cc08415 100644
+--- a/lib/table.c
+++ b/lib/table.c
+@@ -297,10 +297,11 @@ check_dclick(int x, int y, int t)
+ }
+ 
+ int help_is_showing = 0;
+-static void help_nothing() { help_is_showing = 0; }
+static void help_nothing(void) { help_is_showing = 0; }
+static void help_nothing_args(int a, int b, int c) { help_is_showing = 0; }
+ void (*help_redraw)(void) = help_nothing;
+-void (*help_click)(int x, int y, int b) = help_nothing;
+-void (*help_key)(int c, int x, int y) = help_nothing;
+void (*help_click)(int x, int y, int b) = help_nothing_args;
+void (*help_key)(int c, int x, int y) = help_nothing_args;
+ 
+ static int no_resize = 0;
+ void
+-- 
+2.51.2
+
@@ -25,6 +25,8 @@ stdenv.mkDerivation (finalAttrs: {
    # make-imglib.c:205:5: error: 'return' with no value, in function returning non-void [-Wreturn-mismatch]
    # imagelib.c:109:17: error: implicit declaration of function 'malloc' [-Wimplicit-function-declaration]
    ./fix-gcc-14.patch
+    # error: initialization of 'void (*)(int,  int,  int)' from incompatible pointer type 'void (*)(void)' [-Wincompatible-pointer-types]
+    ./fix-gcc-15.patch
  ];

  nativeBuildInputs = [