From 7b9bd29c66fb4374a566e315abc4394e5b624c41 Mon Sep 17 00:00:00 2001
From: Tasos Sahanidis <tasos@tasossah.com>
Date: Sun, 10 Mar 2024 00:33:26 +0200
Subject: extra/libfido: It needs to be in extra, not core

---
 core/libfido2/PKGBUILD                        | 28 --------------------
 core/libfido2/libfido2-1.14.0-no-werror.patch | 38 ---------------------------
 2 files changed, 66 deletions(-)
 delete mode 100644 core/libfido2/PKGBUILD
 delete mode 100644 core/libfido2/libfido2-1.14.0-no-werror.patch

(limited to 'core/libfido2')

diff --git a/core/libfido2/PKGBUILD b/core/libfido2/PKGBUILD
deleted file mode 100644
index 3e4475a6..00000000
--- a/core/libfido2/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# break cycles with systemd
-depends=(${depends[@]//systemd-libs/})
-makedepends=(${makedepends[@]//systemd/})
-
-# somehow -Wno-dev disappeard and we have full -Werror again
-source+=(libfido2-1.14.0-no-werror.patch)
-sha512sums+=(3bc56d2926d5cfc8838d23775254e0d01f68c79a95b94f6787e72b8402c4617cc2a4abf75be6c573e619fd6f94574bdeb2b79f162354230372e935f6e20da709)
-b2sums+=(8a50d473ca2eda54ceaeaae0ce85af1109119949ac5db354b02b726507547f4a9c1f38f9e7d5c598b328ccf3276224a0e5374222dafeaf76e7ebc9aeb891d801)
-
-
-eval "$(
-  {
-    declare -f prepare || \
-    printf 'prepare() {\n}\n'
-  } \
-  | sed '
-    $i cd "${srcdir}/${pkgbase}-${pkgver}" \
-       patch -Np1 -i "$srcdir/libfido2-1.14.0-no-werror.patch"
-  '
-)"
-
-# manpage generators are most likely broken
-eval "$(
-  declare -f build | \
-    sed '
-      s/cmake /cmake -DBUILD_MANPAGES=OFF /
-    '
-)"
diff --git a/core/libfido2/libfido2-1.14.0-no-werror.patch b/core/libfido2/libfido2-1.14.0-no-werror.patch
deleted file mode 100644
index f8bc6f9d..00000000
--- a/core/libfido2/libfido2-1.14.0-no-werror.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -rauN libfido2-1.14.0/CMakeLists.txt libfido2-1.14.0-no-werror/CMakeLists.txt
---- libfido2-1.14.0/CMakeLists.txt	2023-11-13 08:19:20.000000000 +0100
-+++ libfido2-1.14.0-no-werror/CMakeLists.txt	2024-03-09 15:26:30.835589345 +0100
-@@ -90,7 +90,7 @@
- endif()
- 
- check_c_compiler_flag("-Wshorten-64-to-32" HAVE_SHORTEN_64_TO_32)
--check_c_compiler_flag("-Werror -fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
-+check_c_compiler_flag("-fstack-protector-all" HAVE_STACK_PROTECTOR_ALL)
- 
- check_include_files(cbor.h HAVE_CBOR_H)
- check_include_files(endian.h HAVE_ENDIAN_H)
-@@ -123,7 +123,7 @@
- try_compile(HAVE_POSIX_IOCTL
-     "${CMAKE_CURRENT_BINARY_DIR}/posix_ioctl_check.o"
-     "${CMAKE_CURRENT_SOURCE_DIR}/openbsd-compat/posix_ioctl_check.c"
--    COMPILE_DEFINITIONS "-Werror -Woverflow -Wsign-conversion")
-+    COMPILE_DEFINITIONS "-Woverflow -Wsign-conversion")
- 
- list(APPEND CHECK_VARIABLES
- 	HAVE_ARC4RANDOM_BUF
-@@ -295,7 +295,6 @@
- 
- 	add_compile_options(-Wall)
- 	add_compile_options(-Wextra)
--	add_compile_options(-Werror)
- 	add_compile_options(-Wshadow)
- 	add_compile_options(-Wcast-qual)
- 	add_compile_options(-Wwrite-strings)
-@@ -322,7 +321,7 @@
- 
- 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -g2")
- 	set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -fno-omit-frame-pointer")
--	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -D_FORTIFY_SOURCE=2")
-+	set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE}")
- 
- 	if(CRYPTO_VERSION VERSION_GREATER_EQUAL 3.0)
- 		add_definitions(-DOPENSSL_API_COMPAT=0x10100000L)
-- 
cgit v1.2.3-70-g09d2