From a342ae72af9b541750736812156484ba089ac063 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Thu, 21 Jan 2021 00:31:17 +0100 Subject: [PATCH] debian/patches: Refresh, dropping merged --- ...drivers-known-to-fail-in-Big-Endian-.patch | 2 +- ...-parameter-and-array-bounds-warnings.patch | 26 ------------------- debian/patches/series | 1 - 3 files changed, 1 insertion(+), 28 deletions(-) delete mode 100644 debian/patches/nbis-Disable-array-parameter-and-array-bounds-warnings.patch diff --git a/debian/patches/meson-Do-not-support-drivers-known-to-fail-in-Big-Endian-.patch b/debian/patches/meson-Do-not-support-drivers-known-to-fail-in-Big-Endian-.patch index d52d2834..d08883b5 100644 --- a/debian/patches/meson-Do-not-support-drivers-known-to-fail-in-Big-Endian-.patch +++ b/debian/patches/meson-Do-not-support-drivers-known-to-fail-in-Big-Endian-.patch @@ -26,7 +26,7 @@ Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/216 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build -index a2b849b..b35e57e 100644 +index 139c571..483f1ec 100644 --- a/meson.build +++ b/meson.build @@ -89,6 +89,7 @@ cairo_dep = dependency('cairo', required: false) diff --git a/debian/patches/nbis-Disable-array-parameter-and-array-bounds-warnings.patch b/debian/patches/nbis-Disable-array-parameter-and-array-bounds-warnings.patch deleted file mode 100644 index 8524337e..00000000 --- a/debian/patches/nbis-Disable-array-parameter-and-array-bounds-warnings.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: Benjamin Berg -Date: Wed, 9 Dec 2020 15:46:23 +0100 -Subject: nbis: Disable array-parameter and array-bounds warnings - -NBIS just does weird things and while the array-parameter warning is -easy to fix, the other is not trivial. So disable these warnings so that -we can still build using newer GCC versions. - -Origin: https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/2d10d86 ---- - libfprint/meson.build | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libfprint/meson.build b/libfprint/meson.build -index 96cfe9b..4d1d30c 100644 ---- a/libfprint/meson.build -+++ b/libfprint/meson.build -@@ -234,6 +234,8 @@ libnbis = static_library('nbis', - '-Wno-error=redundant-decls', - '-Wno-redundant-decls', - '-Wno-discarded-qualifiers', -+ '-Wno-array-bounds', -+ '-Wno-array-parameter', - ]), - install: false) - diff --git a/debian/patches/series b/debian/patches/series index 458adc9b..6a371149 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,2 @@ -nbis-Disable-array-parameter-and-array-bounds-warnings.patch meson-Do-not-support-drivers-known-to-fail-in-Big-Endian-.patch debian/Tweak-the-udev-rules-creator-for-Debian-usage.patch