From 2a1e70b0202133e6356672c9c9557a828b27f113 Mon Sep 17 00:00:00 2001 From: Simone Caronni Date: Sun, 9 Feb 2020 19:15:52 +0100 Subject: [PATCH] Backport patch to fix build with default GCC 10 options --- remmina-gcc10.patch | 23 +++++++++++++++++++++++ remmina.spec | 8 ++++++-- 2 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 remmina-gcc10.patch diff --git a/remmina-gcc10.patch b/remmina-gcc10.patch new file mode 100644 index 0000000..6b16786 --- /dev/null +++ b/remmina-gcc10.patch @@ -0,0 +1,23 @@ +diff --git a/src/remmina_stats.c b/src/remmina_stats.c +index a6eb6f609ba7f0a5d444da2eb9f34684725625a5..3b7cbf0bf61964cc027c936b753bece49986c193 100644 +--- a/src/remmina_stats.c ++++ b/src/remmina_stats.c +@@ -159,8 +159,6 @@ + #endif + #include "remmina_stats.h" + +-struct utsname u; +- + struct ProfilesData { + GHashTable *proto_count; + GHashTable *proto_date; +@@ -864,9 +862,6 @@ JsonNode *remmina_stats_get_all() + json_builder_set_member_name(b, "REMMINAVERSION"); + json_builder_add_value(b, n); + +- if (uname(&u) == -1) +- g_print("uname:"); +- + n = remmina_stats_get_os_info(); + json_builder_set_member_name(b, "SYSTEM"); + json_builder_add_value(b, n); diff --git a/remmina.spec b/remmina.spec index 950cba3..d9c353a 100644 --- a/remmina.spec +++ b/remmina.spec @@ -1,9 +1,8 @@ -%define _legacy_common_support 1 %global commit0 855d285be8e7096d18d653941d00e3be5e17256f Name: remmina Version: 1.3.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Remote Desktop Client License: GPLv2+ and MIT URL: http://remmina.org @@ -20,6 +19,8 @@ ExcludeArch: aarch64 # So we can't use it directly only as instructions. Source1: pluginBuild-CMakeLists.txt +Patch0: https://gitlab.com/Remmina/Remmina/commit/27f84d1c0a2e4c2432281f25ef3026bb00bbdc15.diff#/remmina-gcc10.patch + %if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: cmake >= 3.0.0 %else @@ -356,6 +357,9 @@ appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/metainfo/*.appdat %{_mandir}/man1/remmina-gnome.1.* %changelog +* Sun Feb 09 2020 Simone Caronni - 1.3.10-2 +- Backport patch to fix build with default GCC 10 options. + * Fri Feb 07 2020 Simone Caronni - 1.3.10-1 - Update to 1.3.10.