From e146b9bf05694d4c6bcc866382cd4edcc5470b4c Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Sun, 3 Mar 2013 15:21:26 +0100 Subject: [PATCH] Correct the kFreeBSD ETIME patch update to define ETIME later. Should fix the new kFreeBSD FTBFS. --- .../kFreeBSD_FTBFS_add_ETIME_definition.patch | 16 ++++++++++++---- .../use-non-versionned-libusbh-path.patch | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch index 27c19eb3..bf8aefde 100644 --- a/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch +++ b/debian/patches/kFreeBSD_FTBFS_add_ETIME_definition.patch @@ -34,14 +34,22 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ #define EP_OUT(n) (n | LIBUSB_ENDPOINT_OUT) --- a/libfprint/drivers/vfs301.c +++ b/libfprint/drivers/vfs301.c -@@ -21,6 +21,10 @@ +@@ -21,6 +21,7 @@ #define FP_COMPONENT "vfs301" ++ + #include + #include + #include +@@ -36,6 +37,10 @@ + + #include "driver_ids.h" + +#ifndef ETIME +#define ETIME ETIMEDOUT /* For kFreeBSD */ +#endif + - #include - #include - #include + /************************** GENERIC STUFF *************************************/ + + /* Callback of asynchronous sleep */ diff --git a/debian/patches/use-non-versionned-libusbh-path.patch b/debian/patches/use-non-versionned-libusbh-path.patch index 68c0ed6b..b767d155 100644 --- a/debian/patches/use-non-versionned-libusbh-path.patch +++ b/debian/patches/use-non-versionned-libusbh-path.patch @@ -6,7 +6,7 @@ Author: Didier Raboud Last-Update: 2013-03-03 --- a/libfprint/drivers/vfs301.c +++ b/libfprint/drivers/vfs301.c -@@ -31,7 +31,7 @@ +@@ -28,7 +28,7 @@ #include #include #include