From 1e1f2893dfb94097695a2a3a24d94c3c4eb255a0 Mon Sep 17 00:00:00 2001
From: Florian Weimer <fweimer@redhat.com>
Date: Mar 20 2023 10:14:51 +0000
Subject: Port to C99 (#2179869)


Related to:

  <https://fedoraproject.org/wiki/Changes/PortingToModernC>
  <https://fedoraproject.org/wiki/Toolchain/PortingToModernC>

---

diff --git a/vinagre-c99.patch b/vinagre-c99.patch
new file mode 100644
index 0000000..63598fc
--- /dev/null
+++ b/vinagre-c99.patch
@@ -0,0 +1,54 @@
+Add missing GType types, to avoid defaulting to int.  For C99 compatibility.
+
+diff --git a/plugins/rdp/vinagre-rdp-plugin.c b/plugins/rdp/vinagre-rdp-plugin.c
+index 475110242a3c9b8b..30531098ea5451c2 100644
+--- a/plugins/rdp/vinagre-rdp-plugin.c
++++ b/plugins/rdp/vinagre-rdp-plugin.c
+@@ -234,7 +234,7 @@ __attribute__((constructor)) void
+ rdp_register_types (void)
+ {
+   g_type_init ();
+-  volatile dontoptimiseaway = vinagre_rdp_plugin_get_type ();
++  volatile GType dontoptimiseaway = vinagre_rdp_plugin_get_type ();
+ }
+ 
+ /* vim: set ts=8: */
+diff --git a/plugins/spice/vinagre-spice-plugin.c b/plugins/spice/vinagre-spice-plugin.c
+index 87377eff75c6c625..6c2c951beb28e65f 100644
+--- a/plugins/spice/vinagre-spice-plugin.c
++++ b/plugins/spice/vinagre-spice-plugin.c
+@@ -368,7 +368,7 @@ __attribute__((constructor)) void
+ spice_register_types (void)
+ {
+   g_type_init ();
+-  volatile dontoptimiseaway = vinagre_spice_plugin_get_type ();
++  volatile GType dontoptimiseaway = vinagre_spice_plugin_get_type ();
+ }
+ 
+ /* vim: set ts=8: */
+diff --git a/plugins/ssh/vinagre-ssh-plugin.c b/plugins/ssh/vinagre-ssh-plugin.c
+index 38306d51815c8fb1..1563720ff88b129a 100644
+--- a/plugins/ssh/vinagre-ssh-plugin.c
++++ b/plugins/ssh/vinagre-ssh-plugin.c
+@@ -199,7 +199,7 @@ __attribute__((constructor)) void
+ ssh_register_types (void)
+ {
+   g_type_init ();
+-  volatile dontoptimiseaway = vinagre_ssh_plugin_get_type ();
++  volatile GType dontoptimiseaway = vinagre_ssh_plugin_get_type ();
+ }
+ 
+ /* vim: set ts=8: */
+diff --git a/plugins/vnc/vinagre-vnc-plugin.c b/plugins/vnc/vinagre-vnc-plugin.c
+index d77140f806407ef6..b0100d77aca3b121 100644
+--- a/plugins/vnc/vinagre-vnc-plugin.c
++++ b/plugins/vnc/vinagre-vnc-plugin.c
+@@ -431,7 +431,7 @@ __attribute__((constructor)) void
+ vnc_register_types (void)
+ {
+   g_type_init ();
+-  volatile dontoptimiseaway = vinagre_vnc_plugin_get_type ();
++  volatile GType dontoptimiseaway = vinagre_vnc_plugin_get_type ();
+ }
+ 
+ /* vim: set ts=8: */
diff --git a/vinagre.spec b/vinagre.spec
index e5091b9..49d391c 100644
--- a/vinagre.spec
+++ b/vinagre.spec
@@ -6,7 +6,7 @@
 
 Name:           vinagre
 Version:        3.22.0
-Release:        27%{?dist}
+Release:        28%{?dist}
 Summary:        VNC client for GNOME
 
 License:        GPLv2+
@@ -23,6 +23,7 @@ Patch1:         %{name}-rdp-let-cancel-auth-dialog.patch
 
 # https://gitlab.gnome.org/GNOME/vinagre/merge_requests/7
 Patch2:         fix-appstream-data.patch
+Patch3: vinagre-c99.patch
 
 %if 0%{?with_spice}
 BuildRequires:  pkgconfig(spice-client-gtk-3.0)
@@ -113,6 +114,9 @@ make check
 
 
 %changelog
+* Mon Mar 20 2023 Florian Weimer <fweimer@redhat.com> - 3.22.0-28
+- Port to C99 (#2179869)
+
 * Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.22.0-27
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild