4:57 a.m.
commit 8e10bea6a869b66e4b78b90adad8bef5175cc511
Author: Mamoru TASAKA <mtasaka(a)fedoraproject.org>
Date: Fri Oct 25 13:57:11 2024 +0900
Fix FTBFS with gcc14 -Werror=incompatible-pointer-types
gens-2.15.5-pointer-types.patch | 66 +++++++++++++++++++++++++++++++++++++++++
gens.spec | 8 ++++-
2 files changed, 73 insertions(+), 1 deletion(-)
---
diff --git a/gens-2.15.5-pointer-types.patch b/gens-2.15.5-pointer-types.patch
new file mode 100644
index 0000000..a8a3aa7
--- /dev/null
+++ b/gens-2.15.5-pointer-types.patch
@@ -0,0 +1,66 @@
+diff -urp '--exclude=*~' gens-2.15.5.orig/src/gens/gtkui/glade/callbacks.c
gens-2.15.5/src/gens/gtkui/glade/callbacks.c
+--- gens-2.15.5.orig/src/gens/gtkui/glade/callbacks.c 2008-10-06 00:39:02.000000000
+0900
++++ gens-2.15.5/src/gens/gtkui/glade/callbacks.c 2024-10-25 12:31:34.118000763 +0900
+@@ -1613,7 +1613,7 @@ on_buttonokcd_clicked (GtkButton
+ {
+ strcpy(CDROM_DEV, testo);
+ }
+- k = gtk_combo_box_get_active (comboscatola);
++ k = gtk_combo_box_get_active (GTK_COMBO_BOX(comboscatola));
+ CDROM_SPEED = vettore[k];
+
+ cdrw = lookup_widget(GTK_WIDGET(button), "cdrom_window");
+diff -urp '--exclude=*~' gens-2.15.5.orig/src/gens/segacd/cd_aspi.c
gens-2.15.5/src/gens/segacd/cd_aspi.c
+--- gens-2.15.5.orig/src/gens/segacd/cd_aspi.c 2008-06-20 07:31:34.000000000 +0900
++++ gens-2.15.5/src/gens/segacd/cd_aspi.c 2024-10-25 13:05:34.596455588 +0900
+@@ -53,7 +53,8 @@ LBA2MSF (int lba)
+
+ DWORD (*Get_ASPI_Info) (void);
+ DWORD (*Get_ASPI_Version) (void);
+-DWORD (*Send_ASPI_Command) (LPSRB);
++/* The actual definition of LPSRB is not used below, so far */
++DWORD (*Send_ASPI_Command) (/*LPSRB*/ void *);
+ int ASPI_Command_Running;
+ int CDROM_SPEED;
+ int Num_CD_Drive;
+diff -urp '--exclude=*~' gens-2.15.5.orig/src/gens/util/file/rom.c
gens-2.15.5/src/gens/util/file/rom.c
+--- gens-2.15.5.orig/src/gens/util/file/rom.c 2024-10-25 12:18:46.865954500 +0900
++++ gens-2.15.5/src/gens/util/file/rom.c 2024-10-25 12:28:10.586253741 +0900
+@@ -169,6 +169,7 @@ int
+ Detect_Format (char *Name)
+ {
+ FILE *f;
++ gzFile gf;
+ unzFile zf;
+ unz_file_info zinf;
+ struct chd *cf;
+@@ -224,11 +225,11 @@ Detect_Format (char *Name)
+ }
+ else if (!strcasecmp (".gz", &Name[strlen (Name) - 3]))
+ {
+- f = (FILE *) gzopen (Name, "rb");
+- if (f == NULL)
++ gf = gzopen (Name, "rb");
++ if (gf == Z_NULL)
+ return -1;
+- gzread (f, buf, 1024);
+- gzclose (f);
++ gzread (gf, buf, 1024);
++ gzclose (gf);
+ }
+ else if (!strcasecmp (".chd", &Name[strlen (Name) -4]))
+ {
+@@ -588,11 +589,11 @@ Load_Rom (char *Name, int inter)
+ Rom *
+ Load_Rom_Gz (char *Name, int inter)
+ {
+- FILE *Rom_File;
++ gzFile Rom_File;
+ int Size = 0;
+ char *read_buf[1024];
+ //SetCurrentDirectory (Gens_Path);
+- if ((Rom_File = (FILE *) gzopen (Name, "rb")) == 0)
++ if ((Rom_File = gzopen (Name, "rb")) == Z_NULL)
+ {
+ printf("No genesis or 32X roms file found in gzip");
+ open_msgbox ("No genesis or 32X roms file found in gzip");
diff --git a/gens.spec b/gens.spec
index 804f11b..1a24cd3 100644
--- a/gens.spec
+++ b/gens.spec
@@ -3,7 +3,7 @@
Summary: A Sega Genesis / Sega CD / Sega 32X emulator
Name: gens
Version: 2.15.5
-Release: 24%{?dist}
+Release: 25%{?dist}
License: GPLv2
Group: Applications/Emulators
URL: http://www.gens.me/
@@ -26,6 +26,8 @@ Patch4: gens-2.15.5-spelling.patch
Patch5: gens-2.15.5-strings.patch
# OpenSUSE
Patch6: gens-2.15.5-rpmlint.patch
+# Fix gcc -Werror=incompatible-pointer-types
+Patch7: gens-2.15.5-pointer-types.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# This is to build only for ix86 on plague
ExclusiveArch: i686
@@ -52,6 +54,7 @@ It was the fastest on win32, and is pretty fast on Linux.
%patch -P4 -p1
%patch -P5 -p1
%patch -P6 -p0
+%patch -P7 -p1
# Fix line encoding
sed -i 's/\r//' gens.txt
@@ -108,6 +111,9 @@ fi
%doc AUTHORS BUGS COPYING gens.txt history.txt README
%changelog
+* Fri Oct 25 2024 Mamoru TASAKA <mtasaka(a)fedoraproject.org> - 2.15.5-25
+- Fix FTBFS with gcc14 -Werror=incompatible-pointer-types
+
* Fri Aug 02 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> -
2.15.5-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild