mirrors/libfprint
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/libfprint.git synced 2026-06-11 02:28:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'debian/1%1.94.6-1' into ubuntu

Browse Source 
libfprint Debian release 1:1.94.6-1
This commit is contained in:
Marco Trevisan (Treviño)
2023-08-23 01:15:54 +02:00
parent 31168e8f83 a530bb66b0
commit 843ca987aa
7 changed files with 80 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
debian/patches/series
Vendored
+3 -2
View File
@@ -1,4 +1,5 @@
tests-Install-current-TOD-driver-in-installed-tests-and-u.patch
tests-Use-native-GTest-utils-to-generate-assets-names.patch
tests-Use-tests-execdir-install-rpath.patch
tests-egis0570-capture.pcapng-Remove-execution-permission.patch
tests-Remove-executable-bits-from-installed-libraries.patch
tests-Install-current-TOD-driver-in-installed-tests-and-u.patch
tests-Use-tests-execdir-install-rpath.patch
debian/patches/tests-Install-current-TOD-driver-in-installed-tests-and-u.patch
Vendored
+5 -5
View File
@@ -7,10 +7,10 @@ Subject: tests: Install current TOD driver in installed tests and use it
1 file changed, 9 insertions(+), 4 deletions(-)
diff --git a/tests/meson.build b/tests/meson.build
index fe87ef0..5058ae3 100644
index 1eb2b4b..2832158 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -131,6 +131,7 @@ if get_option('introspection')
@@ -139,6 +139,7 @@ if get_option('introspection')
'LD_LIBRARY_PATH=' + installed_tests_libdir,
'FP_PRINTS_PATH=' + installed_tests_testdir / 'prints',
# FIXME: Adding this requires gnome-desktop-testing!12
@@ -18,7 +18,7 @@ index fe87ef0..5058ae3 100644
]),
'extra_content': '',
},
@@ -389,7 +390,8 @@ if get_option('tod')
@@ -393,7 +394,8 @@ if get_option('tod')
],
include_directories: include_directories('../libfprint'),
dependencies: deps,
@@ -28,7 +28,7 @@ index fe87ef0..5058ae3 100644
)
fp_todv1_enums = gnome.mkenums_simple('fp-todv1-enums',
@@ -494,8 +496,10 @@ if get_option('tod')
@@ -498,8 +500,10 @@ if get_option('tod')
endif
tod_test_envs = tod_envs
tod_test_envs.prepend('FP_DRIVERS_WHITELIST', tod_driver)
@@ -41,7 +41,7 @@ index fe87ef0..5058ae3 100644
tod_test_envs.set('FP_TOD_TEST_DRIVER_NAME', tod_driver)
test(tod_test_name + '-' + tod_driver,
@@ -520,7 +524,8 @@ if get_option('tod')
@@ -524,7 +528,8 @@ if get_option('tod')
'env': ' '.join([
tod_envs_str,
'FP_TOD_DRIVERS_DIR=' + installed_tests_execdir /
debian/patches/tests-Use-native-GTest-utils-to-generate-assets-names.patch
Vendored
+4 -3
View File
@@ -2,13 +2,14 @@ From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
Date: Thu, 17 Aug 2023 21:17:26 +0200
Subject: tests: Use native GTest utils to generate assets names
Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/1372d6f08
---
tests/meson.build | 14 +++++++++-----
tests/test-fpi-assembling.c | 4 +---
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/tests/meson.build b/tests/meson.build
index 5058ae3..2832158 100644
index fe87ef0..1eb2b4b 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -6,6 +6,8 @@ envs.set('G_MESSAGES_DEBUG', 'all')
@@ -33,7 +34,7 @@ index 5058ae3..2832158 100644
if get_option('introspection')
envs.prepend('GI_TYPELIB_PATH', meson.project_build_root() / 'libfprint')
virtual_devices_tests = [
@@ -247,10 +255,6 @@ endif
@@ -246,10 +254,6 @@ endif
unit_tests_deps = { 'fpi-assembling' : [cairo_dep] }
@@ -44,7 +45,7 @@ index 5058ae3..2832158 100644
foreach test_name: unit_tests
if unit_tests_deps.has_key(test_name)
missing_deps = false
@@ -278,7 +282,7 @@ foreach test_name: unit_tests
@@ -277,7 +281,7 @@ foreach test_name: unit_tests
basename = 'test-' + test_name
test_exe = executable(basename,
debian/patches/tests-egis0570-capture.pcapng-Remove-execution-permission.patch
Vendored
+13
View File
@@ -0,0 +1,13 @@
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= <mail@3v1n0.net>
Date: Wed, 23 Aug 2023 01:04:33 +0200
Subject: tests/egis0570/capture.pcapng: Remove execution permission
Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/445
---
tests/egis0570/capture.pcapng | Bin
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100755 => 100644 tests/egis0570/capture.pcapng
diff --git a/tests/egis0570/capture.pcapng b/tests/egis0570/capture.pcapng
old mode 100755
new mode 100644