From 3f346b6d99b8987d2f67a69c8607059e0a3fb5b3 Mon Sep 17 00:00:00 2001 From: Christopher Chavez Date: Thu, 12 Nov 2020 21:44:36 -0600 Subject: [PATCH] pinentry-mac: fix implicit function declaration Fixes: https://trac.macports.org/ticket/61421 --- aqua/pinentry-mac/Portfile | 3 ++- .../files/patch-includes-quotes-2.diff | 20 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 aqua/pinentry-mac/files/patch-includes-quotes-2.diff diff --git a/aqua/pinentry-mac/Portfile b/aqua/pinentry-mac/Portfile index 1aeb41d959d2e..6eb3ed82dcd50 100644 --- a/aqua/pinentry-mac/Portfile +++ b/aqua/pinentry-mac/Portfile @@ -25,7 +25,8 @@ checksums rmd160 b4023708d1320bd1b0ad5ce0dc35ec71fc68b33c \ supported_archs x86_64 installs_libs no -patchfiles patch-includes-quotes.diff +patchfiles patch-includes-quotes.diff \ + patch-includes-quotes-2.diff patch.pre_args -p1 # This is a temporary kludge. The new Xcode build system fails to diff --git a/aqua/pinentry-mac/files/patch-includes-quotes-2.diff b/aqua/pinentry-mac/files/patch-includes-quotes-2.diff new file mode 100644 index 0000000000000..07547cb8c5b1a --- /dev/null +++ b/aqua/pinentry-mac/files/patch-includes-quotes-2.diff @@ -0,0 +1,20 @@ +Fix implicit function declaration (error as of Xcode 12): +secmem_free() is declared in "memory.h" rather than +(the system header merely inludes ) +https://trac.macports.org/ticket/61421 + +Upstream-Status: Submitted (https://github.com/GPGTools/pinentry-mac/pull/8) + +diff --git a/Source/pinentry-0.9.4/pinentry/pinentry-curses.c b/Source/pinentry-0.9.4/pinentry/pinentry-curses.c +index fc27d81..4279aff 100644 +--- a/Source/pinentry-0.9.4/pinentry/pinentry-curses.c ++++ b/Source/pinentry-0.9.4/pinentry/pinentry-curses.c +@@ -44,7 +44,7 @@ + #include + #endif /*HAVE_UTIME_H*/ + +-#include ++#include "memory.h" + + #ifdef HAVE_WCHAR_H + #include