From 55a2254f271b6597383c26613ff407fb48638632 Mon Sep 17 00:00:00 2001 From: linjiaxin Date: Fri, 30 Jul 2021 06:50:54 +0000 Subject: [PATCH] update fprintd.spec. --- fprintd.spec | 6 +++++- gcc-10.patch | 34 ++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 gcc-10.patch diff --git a/fprintd.spec b/fprintd.spec index 616f961..4eb2d00 100644 --- a/fprintd.spec +++ b/fprintd.spec @@ -1,10 +1,11 @@ Name: fprintd Version: 0.8.1 -Release: 5 +Release: 6 Summary: Support for consumer fingerprint reader devices License: GPLv2+ Url: http://www.freedesktop.org/wiki/Software/fprint/fprintd Source0: https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/%{name}-%{version}.tar.xz +Patch0: gcc-10.patch BuildRequires: dbus-glib-devel pam-devel libfprint-devel >= 0.1.0 polkit-devel gtk-doc BuildRequires: intltool autoconf automake libtool perl-podlators pkgconfig(systemd) @@ -81,6 +82,9 @@ fi %{_mandir}/man1/fprintd.1.gz %changelog +* Fri Jul 30 2021 linjiaxin5 - 0.8.1-6 +- Fix failure caused by GCC upgrade to 10 + * Fri Feb 26 2021 lingsheng - 0.8.1-5 - Disable with-fingerprint when with-fingerprint is enabled diff --git a/gcc-10.patch b/gcc-10.patch new file mode 100644 index 0000000..d4a3961 --- /dev/null +++ b/gcc-10.patch @@ -0,0 +1,34 @@ +diff -uprN src/main.c src/main.c +--- a/src/main.c 2018-05-25 21:59:57.000000000 +0800 ++++ b/src/main.c 2021-08-03 19:22:20.936874961 +0800 +@@ -34,6 +34,7 @@ + #include "storage.h" + #include "file_storage.h" + ++extern fp_storage store; + extern DBusGConnection *fprintd_dbus_conn; + static gboolean no_timeout = FALSE; + static gboolean g_fatal_warnings = FALSE; +diff -uprN src/storage.h src/storage.h +--- a/src/storage.h 2021-08-03 19:21:30.172006757 +0800 ++++ b/src/storage.h 2021-08-03 19:21:06.431600737 +0800 +@@ -44,7 +44,7 @@ struct storage { + typedef struct storage fp_storage; + + /* The currently setup store */ +-fp_storage store; ++extern fp_storage store; + + #endif + +diff -uprN src/device.c src/device.c +--- a/src/device.c 2021-08-03 19:21:01.023508246 +0800 ++++ b/src/device.c 2021-08-03 19:22:03.900583598 +0800 +@@ -34,6 +34,7 @@ + #include "fprintd.h" + #include "storage.h" + ++fp_storage store; + static char *fingers[] = { + "left-thumb", + "left-index-finger",