commit 8e28c83587c466dca9c599ed2c49221f09a6bbd6 Author: Sérgio M. Basto <sergio(a)serjux.com&gt; Date: Fri Jan 31 18:56:36 2025 +0000 Fix FTBFS with GCC-14 (debian patch) gtetrinet.spec | 8 +++++--- gtk.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 3 deletions(-) --- diff --git a/gtetrinet.spec b/gtetrinet.spec index 7e0b3ee..20a09f2 100644 --- a/gtetrinet.spec +++ b/gtetrinet.spec @@ -1,5 +1,3 @@ -%global build_type_safety_c 2 - %global commit 6d816eeeb7a9dcc0011ef1892c6467455f196e0e %global shortcommit %(c=%{commit}; echo ${c:0:7}) %global gitdate 20220828 @@ -7,7 +5,7 @@ Summary: GNOME version of a tetris game playable on the net Name: gtetrinet Version: 0.7.11 -Release: 28.%{gitdate}.git%{shortcommit}%{?dist} +Release: 29.%{gitdate}.git%{shortcommit}%{?dist} License: GPLv2+ Group: Amusements/Games URL: http://gtetrinet.sourceforge.net/ @@ -15,6 +13,7 @@ Source0: https://github.com/tatankat/gtetrinet/archive/%{commit}/gtetrinet-%{sho Source1: tetrinet.txt Source2: http://www.mavit.pwp.blueyonder.co.uk/mmr-sounds-1.0.tar.gz Source3: %{name}.appdata.xml +Patch1: gtk.patch BuildRequires: gcc BuildRequires: make @@ -67,6 +66,9 @@ install -m 0644 -D %{SOURCE3} %{buildroot}%{_metainfodir}/%{name}.appdata.xml %changelog +* Fri Jan 31 2025 Sérgio Basto <sergio(a)serjux.com&gt; - 0.7.11-29.20220828.git6d816ee +- Fix FTBFS with GCC-14 (debian patch) + * Tue Jan 28 2025 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org&gt; - 0.7.11-28.20220828.git6d816ee - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild diff --git a/gtk.patch b/gtk.patch new file mode 100644 index 0000000..0e13a0c --- /dev/null +++ b/gtk.patch @@ -0,0 +1,49 @@ +diff --git a/src/dialogs.c b/src/dialogs.c +index e5d2b2d..3b9d5ec 100644 +--- a/src/dialogs.c ++++ b/src/dialogs.c +@@ -93,7 +93,7 @@ void connectingdialog_new (void) + gtk_window_set_skip_taskbar_hint (GTK_WINDOW (connectingdialog), TRUE); + progressbar = gtk_progress_bar_new (); + gtk_widget_show (progressbar); +- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(connectingdialog)), ++ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (connectingdialog))), + progressbar, TRUE, TRUE, 0); + + +@@ -173,7 +173,7 @@ void teamdialog_new (void) + g_object_set ((GObject*)entry, "activates_default", TRUE, NULL); + gtk_box_pack_start (GTK_BOX (hbox), entry ,TRUE, TRUE, 0); + gtk_container_set_border_width (GTK_CONTAINER (hbox), GTET_PAD_SMALL); +- gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area(team_dialog)), hbox ,TRUE, TRUE, 0); ++ gtk_box_pack_end (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (team_dialog))), hbox ,TRUE, TRUE, 0); + + /* pass the entry in the data pointer */ + g_signal_connect (G_OBJECT(team_dialog), "response", +@@ -452,7 +452,7 @@ void connectdialog_new (void) + gtk_widget_show (table1); + + gtk_container_set_border_width (GTK_CONTAINER (table1), GTET_PAD_SMALL); +- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(connectdialog)), ++ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (connectdialog))), + table1, TRUE, TRUE, 0); + + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(spectatorcheck), spectating); +@@ -490,7 +490,7 @@ gint key_dialog (char *msg) + NULL); + label = gtk_label_new (msg); + gtk_widget_show (label); +- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(dialog)), ++ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (dialog))), + label, TRUE, TRUE, GTET_PAD_SMALL); + g_signal_connect (G_OBJECT (dialog), "key-press-event", + G_CALLBACK (key_dialog_callback), NULL); +@@ -964,7 +964,7 @@ void prefdialog_new (void) + #endif + + // gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (prefdialog)->action_area), 6); +- gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(prefdialog)), notebook, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area(GTK_DIALOG (prefdialog))), notebook, FALSE, FALSE, 0); + + g_signal_connect (G_OBJECT(soundcheck), "toggled", + G_CALLBACK(prefdialog_soundtoggle), NULL);