Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pinentry-mac: fix implicit function declaration #9085

Merged
merged 1 commit into from
Nov 14, 2020
Merged

pinentry-mac: fix implicit function declaration #9085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion aqua/pinentry-mac/Portfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
20 changes: 20 additions & 0 deletions aqua/pinentry-mac/files/patch-includes-quotes-2.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
Fix implicit function declaration (error as of Xcode 12):
secmem_free() is declared in "memory.h" rather than <memory.h>
(the <memory.h> system header merely inludes <string.h>)
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 <utime.h>
#endif /*HAVE_UTIME_H*/

-#include <memory.h>
+#include "memory.h"

#ifdef HAVE_WCHAR_H
#include <wchar.h>