Merge remote-tracking branch '3v1n0/debian' into debian

This commit is contained in:
Laurent Bigonville
2020-11-13 10:56:16 +01:00
4 changed files with 16 additions and 40 deletions
+14
View File
@@ -1,3 +1,17 @@
libfprint (1:1.90.2-1) UNRELEASED; urgency=medium
* New upstream release
- Fixed crash in VFS0050 (LP: #1876502)
- Enrollment fails with UPEK reader (LP: #1881380)
- Lots of various drivers fixes
- As per a patch for nbis required for some sensors that was accidentally
dropped in an earlier release. Users of sensors/drivers aes1610, aes2501,
aes2550, aes1660, aes2660, elan, upektc_img) need to re-enroll
* d/p/git_reading_pointer.patch:
- Dopped (applied upstream)
-- Marco Trevisan (Treviño) <marco@ubuntu.com> Fri, 19 Jun 2020 16:00:27 +0200
libfprint (1:1.90.1-2) experimental; urgency=medium libfprint (1:1.90.1-2) experimental; urgency=medium
[ Laurent Bigonville ] [ Laurent Bigonville ]
-37
View File
@@ -1,37 +0,0 @@
From 9e2a7235e38f1e17d4964d6f18d6556ef0186cf1 Mon Sep 17 00:00:00 2001
From: Benjamin Berg <bberg@redhat.com>
Date: Wed, 19 Feb 2020 16:20:33 +0100
Subject: [PATCH] tests: Fix reading of gboolean into pointer
Otherwise the payload will be lost later on when using GPOINTER_TO_INT
to cast it back.
See: #236
---
tests/test-device-fake.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tests/test-device-fake.c b/tests/test-device-fake.c
index cd08537..b6a9ce2 100644
--- a/tests/test-device-fake.c
+++ b/tests/test-device-fake.c
@@ -189,6 +189,7 @@ static void
fpi_device_fake_capture (FpDevice *device)
{
FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device);
+ gboolean wait_for_finger;
fake_dev->last_called_function = fpi_device_fake_capture;
g_assert_cmpuint (fpi_device_get_current_action (device), ==, FPI_DEVICE_ACTION_CAPTURE);
@@ -199,7 +200,8 @@ fpi_device_fake_capture (FpDevice *device)
return;
}
- fpi_device_get_capture_data (device, (gboolean *) &fake_dev->action_data);
+ fpi_device_get_capture_data (device, &wait_for_finger);
+ fake_dev->action_data = GINT_TO_POINTER (wait_for_finger);
fpi_device_capture_complete (device, fake_dev->ret_image, fake_dev->ret_error);
}
--
2.24.1
-3
View File
@@ -1,5 +1,2 @@
# Upstream backports
git_reading_pointer.patch
# Debian specifics # Debian specifics
udev-rules-creation-add-Debian-specifics.patch udev-rules-creation-add-Debian-specifics.patch
+2
View File
@@ -1,5 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
export DPKG_GENSYMBOLS_CHECK_LEVEL = 2
# Configuration arguments # Configuration arguments
CONFIG_ARGS = -Dudev_rules_dir=/lib/udev/rules.d -Dgtk-examples=false CONFIG_ARGS = -Dudev_rules_dir=/lib/udev/rules.d -Dgtk-examples=false