diff --git a/bluez-tools.spec b/bluez-tools.spec index a8fc52b..32a2063 100644 --- a/bluez-tools.spec +++ b/bluez-tools.spec @@ -8,14 +8,15 @@ Name: bluez-tools Version: 0.2.0 -Release: 0.12%{?git_rel}%{?dist} +Release: 0.13%{?git_rel}%{?dist} Summary: A set of tools to manage Bluetooth devices for Linux License: GPLv2+ URL: https://github.com/khvzak/%{name} -Source0: %{url}/archive/%{commit}.tar.gz#/%{name}-%{version}%{?git_ver}.tar.gz +Source0: %{url}/archive/%{commit}/%{name}-%{version}%{?git_ver}.tar.gz +Patch0: %{url}/pull/34.patch#/fix_gcc-10_compile.patch -BuildRequires: gcc +BuildRequires: gcc BuildRequires: autoconf BuildRequires: automake BuildRequires: glib2-devel @@ -59,6 +60,9 @@ pedometers and other specific APIs have not been ported to bluez-tools. %changelog +* Fri Jan 31 2020 Leigh Scott - 0.2.0-0.13.git20170912.7cb788c +- Fix gcc-10 compile + * Tue Jan 28 2020 Fedora Release Engineering - 0.2.0-0.12.git20170912.7cb788c - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/fix_gcc-10_compile.patch b/fix_gcc-10_compile.patch new file mode 100644 index 0000000..571d9de --- /dev/null +++ b/fix_gcc-10_compile.patch @@ -0,0 +1,43 @@ +From 687105d611b38961f390f0a328f9cfa3b93aeb18 Mon Sep 17 00:00:00 2001 +From: Leigh Scott +Date: Tue, 28 Jan 2020 22:46:37 +0000 +Subject: [PATCH] fix gcc-10 compile + +--- + src/lib/agent-helper.c | 2 ++ + src/lib/agent-helper.h | 4 ++-- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/lib/agent-helper.c b/src/lib/agent-helper.c +index bf50bcc..2b94100 100644 +--- a/src/lib/agent-helper.c ++++ b/src/lib/agent-helper.c +@@ -33,6 +33,8 @@ + + #include "agent-helper.h" + ++gboolean agent_need_unregister; ++ + static const gchar *_bt_agent_introspect_xml = "\n\t\n\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\t\n\t\t\t\n\t\t\n\t\t\n\t\t\n\t\n\n"; + static guint _bt_agent_registration_id = 0; + static GHashTable *_pin_hash_table = NULL; +diff --git a/src/lib/agent-helper.h b/src/lib/agent-helper.h +index 8e1cc85..9a952c4 100644 +--- a/src/lib/agent-helper.h ++++ b/src/lib/agent-helper.h +@@ -35,7 +35,7 @@ extern "C" { + #define AGENT_DBUS_INTERFACE "org.bluez.Agent1" + #define AGENT_PATH "/org/blueztools" + +-gboolean agent_need_unregister; ++extern gboolean agent_need_unregister; + + void register_agent_callbacks(gboolean interactive_console, GHashTable *pin_dictonary, gpointer main_loop_object, GError **error); + void unregister_agent_callbacks(GError **error); +@@ -44,4 +44,4 @@ void unregister_agent_callbacks(GError **error); + } + #endif + +-#endif /* __AGENT_HELPER_H */ +\ No newline at end of file ++#endif /* __AGENT_HELPER_H */