diff --git a/gvsbuild/patches/libfido2/0001-Install-pkgconfig-files-also-on-msvc.patch b/gvsbuild/patches/libfido2/0001-Install-pkgconfig-files-also-on-msvc.patch deleted file mode 100644 index ce75f0b8d..000000000 --- a/gvsbuild/patches/libfido2/0001-Install-pkgconfig-files-also-on-msvc.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dd8f6403dd58e67b3f62fa7d41f8d16ac3cdfd40 Mon Sep 17 00:00:00 2001 -From: Ignacio Casal Quinteiro -Date: Wed, 15 Nov 2023 11:39:36 +0100 -Subject: [PATCH] Install pkgconfig files also on msvc - ---- - src/CMakeLists.txt | 8 +++----- - 1 file changed, 3 insertions(+), 5 deletions(-) - -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 73493b1..4c54198 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -151,8 +151,6 @@ endif() - install(FILES fido.h DESTINATION include) - install(DIRECTORY fido DESTINATION include) - --if(NOT MSVC) -- configure_file(libfido2.pc.in libfido2.pc @ONLY) -- install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libfido2.pc" -- DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") --endif() -+configure_file(libfido2.pc.in libfido2.pc @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/libfido2.pc" -+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") --- -2.34.1 - 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 deleted file mode 100644 index 5c1939ce5..000000000 --- a/gvsbuild/patches/libfido2/0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 d6e0c8988..d5c46c2b6 100644 --- a/gvsbuild/projects/libfido2.py +++ b/gvsbuild/projects/libfido2.py @@ -36,10 +36,7 @@ def __init__(self): "openssl", "libcbor", ], - patches=[ - "0001-libfido2-update-cmake-script-to-have-sdl-flag-before.patch", - "0001-Install-pkgconfig-files-also-on-msvc.patch", - ], + patches=[], ) def build(self):