!11 fix failure caused by GCC upgrade to 10
From: @Lin__Jiaxin Reviewed-by: @small_leek Signed-off-by: @small_leek
This commit is contained in:
commit
2b6dd574cf
@ -1,10 +1,11 @@
|
|||||||
Name: fprintd
|
Name: fprintd
|
||||||
Version: 0.8.1
|
Version: 0.8.1
|
||||||
Release: 5
|
Release: 6
|
||||||
Summary: Support for consumer fingerprint reader devices
|
Summary: Support for consumer fingerprint reader devices
|
||||||
License: GPLv2+
|
License: GPLv2+
|
||||||
Url: http://www.freedesktop.org/wiki/Software/fprint/fprintd
|
Url: http://www.freedesktop.org/wiki/Software/fprint/fprintd
|
||||||
Source0: https://gitlab.freedesktop.org/libfprint/fprintd/uploads/bdd9f91909f535368b7c21f72311704a/%{name}-%{version}.tar.xz
|
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: dbus-glib-devel pam-devel libfprint-devel >= 0.1.0 polkit-devel gtk-doc
|
||||||
BuildRequires: intltool autoconf automake libtool perl-podlators pkgconfig(systemd)
|
BuildRequires: intltool autoconf automake libtool perl-podlators pkgconfig(systemd)
|
||||||
@ -81,6 +82,9 @@ fi
|
|||||||
%{_mandir}/man1/fprintd.1.gz
|
%{_mandir}/man1/fprintd.1.gz
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Jul 30 2021 linjiaxin5 <linjiaxin5@huawei.com> - 0.8.1-6
|
||||||
|
- Fix failure caused by GCC upgrade to 10
|
||||||
|
|
||||||
* Fri Feb 26 2021 lingsheng <lingsheng@huawei.com> - 0.8.1-5
|
* Fri Feb 26 2021 lingsheng <lingsheng@huawei.com> - 0.8.1-5
|
||||||
- Disable with-fingerprint when with-fingerprint is enabled
|
- Disable with-fingerprint when with-fingerprint is enabled
|
||||||
|
|
||||||
|
|||||||
34
gcc-10.patch
Normal file
34
gcc-10.patch
Normal file
@ -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",
|
||||||
Loading…
x
Reference in New Issue
Block a user