From 3cce50697c119bea087a60a58d7ccb305efa21f7 Mon Sep 17 00:00:00 2001 From: Alessandro Bono Date: Wed, 26 Jun 2024 10:25:12 +0200 Subject: [PATCH] libfido: Restore removed patch Restore one of the patches removed in 676cb4ef4c09fc4ec0b7d18ad34e7829eb0ffb88. The restored patch is not yet included upstream: https://github.com/Yubico/libfido2/blob/03c18d396eb209a42bbf62f5f4415203cba2fc50/CMakeLists.txt#L212-L214C2 --- ...cmake-script-to-have-sdl-flag-before.patch | 30 +++++++++++++++++++ gvsbuild/projects/libfido2.py | 4 ++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch diff --git a/gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch b/gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch new file mode 100644 index 000000000..5c1939ce5 --- /dev/null +++ b/gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch @@ -0,0 +1,30 @@ +From c3c7343d3a18de2f00f288db4969ec07cb1fae09 Mon Sep 17 00:00:00 2001 +From: Mofidul Jamal +Date: Fri, 18 Aug 2023 14:11:21 -0400 +Subject: [PATCH] libfido2: update cmake script to have /sdl flag before -W4 + and warning disabled flags + +--- + CMakeLists.txt | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 6fa341a..e97976c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -209,9 +209,9 @@ if(MSVC) + string(REPLACE "C" " -wd" MSVC_DISABLED_WARNINGS_STR + ${MSVC_DISABLED_WARNINGS_LIST}) + string(REGEX REPLACE "[/-]W[1234][ ]?" "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS}) +- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -MP -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}") +- set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od /Z7 /guard:cf /sdl /RTCcsu") +- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi /guard:cf /sdl") ++ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /sdl -MP -W4 -WX ${MSVC_DISABLED_WARNINGS_STR}") ++ set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} /Od /Z7 /guard:cf /RTCcsu") ++ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} /Zi /guard:cf") + if(USE_WINHELLO) + add_definitions(-DUSE_WINHELLO) + endif() +-- +2.37.1.windows.1 + diff --git a/gvsbuild/projects/libfido2.py b/gvsbuild/projects/libfido2.py index d5c46c2b6..2ec47b055 100644 --- a/gvsbuild/projects/libfido2.py +++ b/gvsbuild/projects/libfido2.py @@ -36,7 +36,9 @@ def __init__(self): "openssl", "libcbor", ], - patches=[], + patches=[ + "0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch", + ], ) def build(self):