emulators/xnp2: fix GTK type problems revealed by llvm22

2026-06-17 23:13:55 +02:00 · 2026-06-09 20:57:51 +00:00
parent 2ba387d0b8
commit b261f1cbbf
3 changed files with 54 additions and 1 deletions
@@ -2,7 +2,7 @@ COMMENT =		PC-9801 emulator

 DISTNAME =		xnp2-0.86
 EPOCH =			0
-REVISION =		6
+REVISION =		7
 CATEGORIES =		emulators

 HOMEPAGE =		https://nonakap.org/np2/
@@ -0,0 +1,23 @@
+Index: x11/gtk2/dialog_screen.c
+--- x11/gtk2/dialog_screen.c.orig
+++ x11/gtk2/dialog_screen.c
+@@ -45,7 +45,7 @@
+ static GtkWidget *video_lcd_checkbutton;
+ static GtkWidget *video_lcd_reverse_checkbutton;
+ static GtkWidget *video_skipline_checkbutton;
+-static GObject *video_skipline_ratio_adj;
+static GtkObject *video_skipline_ratio_adj;
+ 
+ /*
+  * Chip
+@@ -61,8 +61,8 @@ static const char *timing_waitclock_str[] = {
+ 	"T-RAM", "V-RAM", "GRCG"
+ };
+ 
+-static GObject *timing_waitclock_adj[NELEMENTS(timing_waitclock_str)];
+-static GObject *timing_realpal_adj;
+static GtkObject *timing_waitclock_adj[NELEMENTS(timing_waitclock_str)];
+static GtkObject *timing_realpal_adj;
+ 
+ 
+ static void
@@ -0,0 +1,30 @@
+Index: x11/gtk2/dialog_sound.c
+--- x11/gtk2/dialog_sound.c.orig
+++ x11/gtk2/dialog_sound.c
+@@ -55,7 +55,7 @@ static const struct {
+ 	{ "Rhythm", &np2cfg.vol_rhythm, 0.0, 128.0 },
+ };
+ 
+-static GObject *mixer_adj[NELEMENTS(mixer_vol_tbl)];
+static GtkObject *mixer_adj[NELEMENTS(mixer_vol_tbl)];
+ 
+ 
+ /*
+@@ -66,7 +66,7 @@ static const char *snd14_vol_str[] = {
+ 	"left", "right", "f2", "f4", "f8", "f16"
+ };
+ 
+-static GObject *snd14_adj[NELEMENTS(snd14_vol_str)];
+static GtkObject *snd14_adj[NELEMENTS(snd14_vol_str)];
+ 
+ 
+ /*
+@@ -223,7 +223,7 @@ static GtkWidget *spb_int_entry;
+ static GtkWidget *spb_romaddr_entry;
+ static GtkWidget *spb_vr_channel_checkbutton[2];
+ static GtkWidget *spb_reverse_channel_checkbutton;
+-static GObject *spb_vr_level_adj;
+static GtkObject *spb_vr_level_adj;
+ 
+ 
+ /*