From 1a818d4c2dfb4fbe45d81ac1d50fbe5736f65cbf Mon Sep 17 00:00:00 2001
From: Pascal Terjan <pterjan@mageia.org>
Date: Mon, 27 Oct 2025 22:04:51 +0000
Subject: [PATCH] Fix Ruby binding for new GCC

Patch from Fedora
https://src.fedoraproject.org/rpms/libcaca/blob/rawhide/f/libcaca-0.99.beta20-c99.patch
---
 ruby/caca-canvas.c  | 9 +++++----
 ruby/caca-display.c | 2 +-
 ruby/caca-font.c    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/ruby/caca-canvas.c b/ruby/caca-canvas.c
index 5dc66ab..1bf0538 100644
--- a/ruby/caca-canvas.c
+++ b/ruby/caca-canvas.c
@@ -16,6 +16,7 @@
 #include <errno.h>
 #include "caca-dither.h"
 #include "caca-font.h"
+#include "caca_internals.h"
 #include "common.h"
 
 VALUE cCanvas;
@@ -742,7 +743,7 @@ void Init_caca_canvas(VALUE mCaca)
     rb_define_method(cCanvas, "put_str", put_str, 3);
     rb_define_method(cCanvas, "printf", cprintf, -1);
 
-    rb_define_method(cCanvas, "get_attr", get_attr, 3);
+    rb_define_method(cCanvas, "get_attr", get_attr, 2);
     rb_define_method(cCanvas, "attr=", set_attr, 1);
     rb_define_method(cCanvas, "set_attr", set_attr2, 1);
     rb_define_method(cCanvas, "put_attr", put_attr, 3);
@@ -773,7 +774,7 @@ void Init_caca_canvas(VALUE mCaca)
     rb_define_method(cCanvas, "draw_triangle", draw_triangle, 7);
     rb_define_method(cCanvas, "draw_thin_triangle", draw_thin_triangle, 6);
     rb_define_method(cCanvas, "fill_triangle", fill_triangle, 7);
-    rb_define_method(cCanvas, "fill_triangle_textured", fill_triangle_textured, 4);
+    rb_define_method(cCanvas, "fill_triangle_textured", fill_triangle_textured, 3);
     rb_define_method(cCanvas, "dither_bitmap", dither_bitmap, 6);
 
     rb_define_method(cCanvas, "frame_count", get_frame_count, 0);
@@ -792,8 +793,8 @@ void Init_caca_canvas(VALUE mCaca)
     rb_define_method(cCanvas, "import_area_from_file", import_area_from_file, 4);
     rb_define_method(cCanvas, "export_to_memory", export_to_memory, 1);
     rb_define_method(cCanvas, "export_area_to_memory", export_area_to_memory, 5);
-    rb_define_singleton_method(cCanvas, "export_list", export_list, 0);
-    rb_define_singleton_method(cCanvas, "import_list", import_list, 0);
+    rb_define_singleton_method(cCanvas, "export_list", (VALUE (*)(VALUE)) export_list, 0);
+    rb_define_singleton_method(cCanvas, "import_list", (VALUE (*)(VALUE)) import_list, 0);
 
     rb_define_method(cCanvas, "disable_dirty_rect", disable_dirty_rect, 0);
     rb_define_method(cCanvas, "enable_dirty_rect", enable_dirty_rect, 0);
diff --git a/ruby/caca-display.c b/ruby/caca-display.c
index ac29daf..6e4cfa2 100644
--- a/ruby/caca-display.c
+++ b/ruby/caca-display.c
@@ -226,7 +226,7 @@ static VALUE get_event(VALUE self, VALUE event_mask, VALUE timeout)
     return e;
 }
 
-static VALUE driver_list(void)
+static VALUE driver_list(VALUE unused)
 {
     VALUE ary;
     char const* const* list;
diff --git a/ruby/caca-font.c b/ruby/caca-font.c
index 705f928..72b5629 100644
--- a/ruby/caca-font.c
+++ b/ruby/caca-font.c
@@ -41,7 +41,7 @@ static VALUE font_initialize(VALUE self, VALUE name)
     return self;
 }
 
-static VALUE font_list(void)
+static VALUE font_list(VALUE unused)
 {
     VALUE ary;
     char const* const* list;