From ec4cde6ffb4161a74a80db4c4881ebdc9eae7da1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 10 Dec 2020 15:22:44 +0100 Subject: [PATCH] debian/patches: Refresh --- ...wap-two-times-the-NBIS-array-content.patch | 65 ---- ...roper-type-on-identification-success.patch | 31 -- debian/patches/series | 3 - ...s-check-the-return-values-for-the-AP.patch | 323 ------------------ 4 files changed, 422 deletions(-) delete mode 100644 debian/patches/fp-print-Don-t-byte-swap-two-times-the-NBIS-array-content.patch delete mode 100644 debian/patches/fpi-device-Return-proper-type-on-identification-success.patch delete mode 100644 debian/patches/test-fpi-device-Always-check-the-return-values-for-the-AP.patch diff --git a/debian/patches/fp-print-Don-t-byte-swap-two-times-the-NBIS-array-content.patch b/debian/patches/fp-print-Don-t-byte-swap-two-times-the-NBIS-array-content.patch deleted file mode 100644 index c4cf6437..00000000 --- a/debian/patches/fp-print-Don-t-byte-swap-two-times-the-NBIS-array-content.patch +++ /dev/null @@ -1,65 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 2 Dec 2020 14:58:09 +0000 -Subject: fp-print: Don't byte-swap two times the NBIS array contents - -When serializing an image print in big endian machine we ended up -swapping the arrays contents two times, first when adding the values and -eventually when calling g_variant_byteswap which already handles this -properly. - -With this, we get the test passing into s390x. - -Fixes: #236 - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/de271a0 ---- - libfprint/fp-print.c | 23 ++++++----------------- - 1 file changed, 6 insertions(+), 17 deletions(-) - -diff --git a/libfprint/fp-print.c b/libfprint/fp-print.c -index c485975..70775c9 100644 ---- a/libfprint/fp-print.c -+++ b/libfprint/fp-print.c -@@ -667,36 +667,25 @@ fp_print_serialize (FpPrint *print, - for (i = 0; i < print->prints->len; i++) - { - struct xyt_struct *xyt = g_ptr_array_index (print->prints, i); -- gint j; -- gint32 *col = g_new (gint32, xyt->nrows); - - g_variant_builder_open (&nested, G_VARIANT_TYPE ("(aiaiai)")); - -- for (j = 0; j < xyt->nrows; j++) -- col[j] = GINT32_TO_LE (xyt->xcol[j]); - g_variant_builder_add_value (&nested, - g_variant_new_fixed_array (G_VARIANT_TYPE_INT32, -- col, -+ xyt->xcol, - xyt->nrows, -- sizeof (col[0]))); -- -- for (j = 0; j < xyt->nrows; j++) -- col[j] = GINT32_TO_LE (xyt->ycol[j]); -+ sizeof (xyt->xcol[0]))); - g_variant_builder_add_value (&nested, - g_variant_new_fixed_array (G_VARIANT_TYPE_INT32, -- col, -+ xyt->ycol, - xyt->nrows, -- sizeof (col[0]))); -- -- for (j = 0; j < xyt->nrows; j++) -- col[j] = GINT32_TO_LE (xyt->thetacol[j]); -+ sizeof (xyt->ycol[0]))); - g_variant_builder_add_value (&nested, - g_variant_new_fixed_array (G_VARIANT_TYPE_INT32, -- col, -+ xyt->thetacol, - xyt->nrows, -- sizeof (col[0]))); -+ sizeof (xyt->thetacol[0]))); - g_variant_builder_close (&nested); -- g_free (col); - } - - g_variant_builder_close (&nested); diff --git a/debian/patches/fpi-device-Return-proper-type-on-identification-success.patch b/debian/patches/fpi-device-Return-proper-type-on-identification-success.patch deleted file mode 100644 index cc65e406..00000000 --- a/debian/patches/fpi-device-Return-proper-type-on-identification-success.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 2 Dec 2020 17:05:01 +0100 -Subject: fpi-device: Return proper type on identification success - -Identify function is supposed to propagate a boolean value, but we make -it return an integer instead on idle, this can be normally the same in -most of architectures, but not in BE ones. - -So, make it return the proper type. -Fixes test failures in s390x. - -Related to #236 - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/2783ac3 ---- - libfprint/fpi-device.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libfprint/fpi-device.c b/libfprint/fpi-device.c -index 981df87..0968c0c 100644 ---- a/libfprint/fpi-device.c -+++ b/libfprint/fpi-device.c -@@ -1157,7 +1157,7 @@ fpi_device_identify_complete (FpDevice *device, - } - else - { -- fpi_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_INT, GINT_TO_POINTER (TRUE)); -+ fpi_device_return_task_in_idle (device, FP_DEVICE_TASK_RETURN_BOOL, GUINT_TO_POINTER (TRUE)); - } - } - else diff --git a/debian/patches/series b/debian/patches/series index 9385410f..a64d5176 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1 @@ debian/Tweak-the-udev-rules-creator-for-Debian-usage.patch -fpi-device-Return-proper-type-on-identification-success.patch -test-fpi-device-Always-check-the-return-values-for-the-AP.patch -fp-print-Don-t-byte-swap-two-times-the-NBIS-array-content.patch diff --git a/debian/patches/test-fpi-device-Always-check-the-return-values-for-the-AP.patch b/debian/patches/test-fpi-device-Always-check-the-return-values-for-the-AP.patch deleted file mode 100644 index 368705e7..00000000 --- a/debian/patches/test-fpi-device-Always-check-the-return-values-for-the-AP.patch +++ /dev/null @@ -1,323 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 2 Dec 2020 17:27:00 +0100 -Subject: test-fpi-device: Always check the return values for the API calls - -Ensure that the return value of the API calls match the expected one, -as we need to ensure that it also matches with the error/no-error case. - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/12b0120 ---- - tests/test-fpi-device.c | 121 +++++++++++++++++++++++++----------------------- - 1 file changed, 62 insertions(+), 59 deletions(-) - -diff --git a/tests/test-fpi-device.c b/tests/test-fpi-device.c -index 43e84f7..d492bc7 100644 ---- a/tests/test-fpi-device.c -+++ b/tests/test-fpi-device.c -@@ -534,12 +534,12 @@ test_driver_open (void) - - g_assert (fake_dev->last_called_function != dev_class->probe); - -- fp_device_open_sync (device, NULL, &error); -+ g_assert_true (fp_device_open_sync (device, NULL, &error)); - g_assert (fake_dev->last_called_function == dev_class->open); - g_assert_no_error (error); - g_assert_true (fp_device_is_open (device)); - -- fp_device_close_sync (FP_DEVICE (device), NULL, &error); -+ g_assert_true (fp_device_close_sync (FP_DEVICE (device), NULL, &error)); - g_assert_no_error (error); - } - -@@ -552,7 +552,7 @@ test_driver_open_error (void) - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - - fake_dev->ret_error = fpi_device_error_new (FP_DEVICE_ERROR_GENERAL); -- fp_device_open_sync (device, NULL, &error); -+ g_assert_false (fp_device_open_sync (device, NULL, &error)); - g_assert (fake_dev->last_called_function == dev_class->open); - g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL); - g_assert_false (fp_device_is_open (device)); -@@ -567,7 +567,7 @@ test_driver_close (void) - FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device); - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -- fp_device_close_sync (device, NULL, &error); -+ g_assert_true (fp_device_close_sync (device, NULL, &error)); - g_assert (fake_dev->last_called_function == dev_class->close); - - g_assert_no_error (error); -@@ -583,7 +583,7 @@ test_driver_close_error (void) - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - - fake_dev->ret_error = fpi_device_error_new (FP_DEVICE_ERROR_GENERAL); -- fp_device_close_sync (device, NULL, &error); -+ g_assert_false (fp_device_close_sync (device, NULL, &error)); - - g_assert (fake_dev->last_called_function == dev_class->close); - g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL); -@@ -880,9 +880,9 @@ test_driver_verify (void) - gboolean match; - - fake_dev->ret_result = FPI_MATCH_SUCCESS; -- fp_device_verify_sync (device, enrolled_print, NULL, -- test_driver_match_cb, match_data, -- &match, &out_print, &error); -+ g_assert_true (fp_device_verify_sync (device, enrolled_print, NULL, -+ test_driver_match_cb, match_data, -+ &match, &out_print, &error)); - - g_assert (fake_dev->last_called_function == dev_class->verify); - g_assert (fake_dev->action_data == enrolled_print); -@@ -910,9 +910,9 @@ test_driver_verify_fail (void) - gboolean match; - - fake_dev->ret_result = FPI_MATCH_FAIL; -- fp_device_verify_sync (device, enrolled_print, NULL, -- test_driver_match_cb, match_data, -- &match, &out_print, &error); -+ g_assert_true (fp_device_verify_sync (device, enrolled_print, NULL, -+ test_driver_match_cb, match_data, -+ &match, &out_print, &error)); - - g_assert (fake_dev->last_called_function == dev_class->verify); - g_assert_no_error (error); -@@ -940,9 +940,9 @@ test_driver_verify_retry (void) - - fake_dev->ret_result = FPI_MATCH_ERROR; - fake_dev->ret_error = fpi_device_retry_new (FP_DEVICE_RETRY_GENERAL); -- fp_device_verify_sync (device, enrolled_print, NULL, -- test_driver_match_cb, match_data, -- &match, &out_print, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, -+ test_driver_match_cb, match_data, -+ &match, &out_print, &error)); - - g_assert_true (match_data->called); - g_assert_null (match_data->match); -@@ -968,9 +968,9 @@ test_driver_verify_error (void) - - fake_dev->ret_result = FPI_MATCH_ERROR; - fake_dev->ret_error = fpi_device_error_new (FP_DEVICE_ERROR_GENERAL); -- fp_device_verify_sync (device, enrolled_print, NULL, -- test_driver_match_cb, match_data, -- &match, &out_print, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, -+ test_driver_match_cb, match_data, -+ &match, &out_print, &error)); - - g_assert_false (match_data->called); - g_assert_null (match_data->match); -@@ -1005,9 +1005,9 @@ test_driver_verify_not_reported (void) - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, - "*reported successful verify complete*not report*result*"); - -- fp_device_verify_sync (device, enrolled_print, NULL, -- NULL, NULL, -- NULL, NULL, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, -+ NULL, NULL, -+ NULL, NULL, &error)); - - g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL); - -@@ -1050,9 +1050,9 @@ test_driver_verify_report_no_callback (void) - - fake_dev->ret_result = FPI_MATCH_ERROR; - fake_dev->ret_error = fpi_device_error_new (FP_DEVICE_ERROR_NOT_SUPPORTED); -- fp_device_verify_sync (device, enrolled_print, NULL, -- test_driver_match_cb, match_data, -- &match, &print, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, -+ test_driver_match_cb, match_data, -+ &match, &print, &error)); - - g_test_assert_expected_messages (); - -@@ -1091,8 +1091,8 @@ test_driver_verify_complete_retry (void) - test_driver_match_data_clear (match_data); - fake_dev->ret_result = FPI_MATCH_FAIL; - fake_dev->ret_error = fpi_device_retry_new (FP_DEVICE_RETRY_TOO_SHORT); -- fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -- match_data, &match, &print, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -+ match_data, &match, &print, &error)); - g_test_assert_expected_messages (); - - g_assert_true (error == g_steal_pointer (&fake_dev->ret_error)); -@@ -1113,8 +1113,8 @@ test_driver_verify_complete_retry (void) - fake_dev->ret_result = FPI_MATCH_FAIL; - fake_dev->ret_error = fpi_device_retry_new (FP_DEVICE_RETRY_TOO_SHORT); - fake_dev->user_data = g_error_copy (fake_dev->ret_error); -- fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -- match_data, &match, &print, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -+ match_data, &match, &print, &error)); - - g_test_assert_expected_messages (); - g_assert_true (error != g_steal_pointer (&fake_dev->ret_error)); -@@ -1135,8 +1135,8 @@ test_driver_verify_complete_retry (void) - fake_dev->ret_error = fpi_device_retry_new (FP_DEVICE_RETRY_TOO_SHORT); - fake_dev->user_data = g_error_copy (fake_dev->ret_error); - -- fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -- match_data, &match, &print, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -+ match_data, &match, &print, &error)); - g_test_assert_expected_messages (); - - g_assert_true (error != g_steal_pointer (&fake_dev->ret_error)); -@@ -1155,8 +1155,8 @@ test_driver_verify_complete_retry (void) - test_driver_match_data_clear (match_data); - fake_dev->ret_result = FPI_MATCH_ERROR; - -- fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -- match_data, &match, &print, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -+ match_data, &match, &print, &error)); - g_test_assert_expected_messages (); - - g_assert_true (error != g_steal_pointer (&fake_dev->ret_error)); -@@ -1178,8 +1178,8 @@ test_driver_verify_complete_retry (void) - g_object_add_weak_pointer (G_OBJECT (fake_dev->ret_print), - (gpointer) (&fake_dev->ret_print)); - -- fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -- match_data, &match, &print, &error); -+ g_assert_false (fp_device_verify_sync (device, enrolled_print, NULL, test_driver_match_cb, -+ match_data, &match, &print, &error)); - g_test_assert_expected_messages (); - - g_assert_error (error, FP_DEVICE_RETRY, FP_DEVICE_RETRY_TOO_SHORT); -@@ -1244,9 +1244,9 @@ test_driver_identify (void) - g_assert_true (fp_device_supports_identify (device)); - - fake_dev->ret_print = fp_print_new (device); -- fp_device_identify_sync (device, prints, NULL, -- test_driver_match_cb, match_data, -- &matched_print, &print, &error); -+ g_assert_true (fp_device_identify_sync (device, prints, NULL, -+ test_driver_match_cb, match_data, -+ &matched_print, &print, &error)); - - g_assert_true (match_data->called); - g_assert_nonnull (match_data->match); -@@ -1280,9 +1280,9 @@ test_driver_identify_fail (void) - g_assert_true (fp_device_supports_identify (device)); - - fake_dev->ret_print = fp_print_new (device); -- fp_device_identify_sync (device, prints, NULL, -- test_driver_match_cb, match_data, -- &matched_print, &print, &error); -+ g_assert_true (fp_device_identify_sync (device, prints, NULL, -+ test_driver_match_cb, match_data, -+ &matched_print, &print, &error)); - - g_assert_true (match_data->called); - g_assert_null (match_data->match); -@@ -1320,9 +1320,9 @@ test_driver_identify_retry (void) - g_assert_true (fp_device_supports_identify (device)); - - fake_dev->ret_error = fpi_device_retry_new (FP_DEVICE_RETRY_GENERAL); -- fp_device_identify_sync (device, prints, NULL, -- test_driver_match_cb, match_data, -- &matched_print, &print, &error); -+ g_assert_false (fp_device_identify_sync (device, prints, NULL, -+ test_driver_match_cb, match_data, -+ &matched_print, &print, &error)); - - g_assert_true (match_data->called); - g_assert_null (match_data->match); -@@ -1358,9 +1358,9 @@ test_driver_identify_error (void) - g_assert_true (fp_device_supports_identify (device)); - - fake_dev->ret_error = fpi_device_error_new (FP_DEVICE_ERROR_GENERAL); -- fp_device_identify_sync (device, prints, NULL, -- test_driver_match_cb, match_data, -- &matched_print, &print, &error); -+ g_assert_false (fp_device_identify_sync (device, prints, NULL, -+ test_driver_match_cb, match_data, -+ &matched_print, &print, &error)); - - g_assert_false (match_data->called); - g_assert_null (match_data->match); -@@ -1399,9 +1399,9 @@ test_driver_identify_not_reported (void) - g_test_expect_message (G_LOG_DOMAIN, G_LOG_LEVEL_WARNING, - "*reported successful identify complete*not report*result*"); - -- fp_device_identify_sync (device, prints, NULL, -- NULL, NULL, -- NULL, NULL, &error); -+ g_assert_false (fp_device_identify_sync (device, prints, NULL, -+ NULL, NULL, -+ NULL, NULL, &error)); - - g_assert_error (error, FP_DEVICE_ERROR, FP_DEVICE_ERROR_GENERAL); - -@@ -1450,8 +1450,9 @@ test_driver_identify_complete_retry (void) - fake_dev->ret_error = fpi_device_retry_new (FP_DEVICE_RETRY_TOO_SHORT); - fake_dev->user_data = g_error_copy (fake_dev->ret_error); - -- fp_device_identify_sync (device, prints, NULL, test_driver_match_cb, match_data, -- &match, &print, &error); -+ g_assert_false (fp_device_identify_sync (device, prints, NULL, -+ test_driver_match_cb, match_data, -+ &match, &print, &error)); - g_test_assert_expected_messages (); - - g_assert_true (error != g_steal_pointer (&fake_dev->ret_error)); -@@ -1470,8 +1471,9 @@ test_driver_identify_complete_retry (void) - fake_dev->ret_match = fp_print_new (device); - g_object_add_weak_pointer (G_OBJECT (fake_dev->ret_match), - (gpointer) (&fake_dev->ret_match)); -- fp_device_identify_sync (device, prints, NULL, test_driver_match_cb, match_data, -- &match, &print, &error); -+ g_assert_true (fp_device_identify_sync (device, prints, NULL, -+ test_driver_match_cb, match_data, -+ &match, &print, &error)); - g_test_assert_expected_messages (); - - g_object_unref (fake_dev->ret_match); -@@ -1493,8 +1495,9 @@ test_driver_identify_complete_retry (void) - fake_dev->ret_print = fp_print_new (device); - g_object_add_weak_pointer (G_OBJECT (fake_dev->ret_print), - (gpointer) (&fake_dev->ret_print)); -- fp_device_identify_sync (device, prints, NULL, test_driver_match_cb, match_data, -- &match, &print, &error); -+ g_assert_false (fp_device_identify_sync (device, prints, NULL, -+ test_driver_match_cb, match_data, -+ &match, &print, &error)); - g_test_assert_expected_messages (); - - g_assert_error (error, FP_DEVICE_RETRY, FP_DEVICE_RETRY_REMOVE_FINGER); -@@ -1531,9 +1534,9 @@ test_driver_identify_report_no_callback (void) - "*Driver reported a verify error that was not in the retry domain*"); - - fake_dev->ret_error = fpi_device_error_new (FP_DEVICE_ERROR_NOT_SUPPORTED); -- fp_device_identify_sync (device, prints, NULL, -- test_driver_match_cb, match_data, -- &match, &print, &error); -+ g_assert_false (fp_device_identify_sync (device, prints, NULL, -+ test_driver_match_cb, match_data, -+ &match, &print, &error)); - - g_test_assert_expected_messages (); - -@@ -1818,7 +1821,7 @@ test_driver_cancel_fail (void) - FpDeviceClass *dev_class = FP_DEVICE_GET_CLASS (device); - FpiDeviceFake *fake_dev = FPI_DEVICE_FAKE (device); - -- fp_device_delete_print_sync (device, enrolled_print, cancellable, &error); -+ g_assert_true (fp_device_delete_print_sync (device, enrolled_print, cancellable, &error)); - g_assert (fake_dev->last_called_function == dev_class->delete); - g_cancellable_cancel (cancellable); - -@@ -1889,7 +1892,7 @@ test_driver_action_get_cancellable_open (void) - fake_dev = FPI_DEVICE_FAKE (device); - - cancellable = g_cancellable_new (); -- fp_device_open_sync (device, cancellable, NULL); -+ g_assert_true (fp_device_open_sync (device, cancellable, NULL)); - - g_assert (fake_dev->last_called_function == test_driver_action_get_cancellable_open_vfunc); - }