<pre style='margin:0'>
Leonardo Brondani Schenkel (lbschenkel) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7fbd9a3b6540b7eca594d7334fd3a75484d8a99c">https://github.com/macports/macports-ports/commit/7fbd9a3b6540b7eca594d7334fd3a75484d8a99c</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 7fbd9a3 opensc: fix build issues on Xcode 10
</span>7fbd9a3 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7fbd9a3b6540b7eca594d7334fd3a75484d8a99c
</span>Author: Leonardo Brondani Schenkel <lbschenkel@macports.org>
AuthorDate: Wed Nov 7 14:12:10 2018 +0100
<span style='display:block; white-space:pre;color:#404040;'> opensc: fix build issues on Xcode 10
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add upstream patch to fix errors on Xcode 10 [1]
</span><span style='display:block; white-space:pre;color:#404040;'> - add patch to fix errors on Xcode 10+macOS 13 [2]
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> [1] https://github.com/OpenSC/OpenSC/issues/1485
</span><span style='display:block; white-space:pre;color:#404040;'> [2] https://github.com/OpenSC/OpenSC/issues/1486
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/57535
</span>---
security/opensc/Portfile | 5 ++++-
security/opensc/files/patch-winscard.diff | 23 +++++++++++++++++++
security/opensc/files/patch-xcode10.diff | 37 +++++++++++++++++++++++++++++++
3 files changed, 64 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/opensc/Portfile b/security/opensc/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ca31d59..d56c142 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/security/opensc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/opensc/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@ PortGroup github 1.0
</span>
name opensc
github.setup OpenSC OpenSC 0.19.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories security
platforms darwin
license LGPL-2.1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -39,6 +39,9 @@ depends_lib path:lib/libcrypto.dylib:openssl port:zlib
</span>
default_variants +readline
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-winscard.diff patch-xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_autoreconf yes
configure.args-append --disable-openpace
configure.args-append --disable-readline
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/opensc/files/patch-winscard.diff b/security/opensc/files/patch-winscard.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5360b0b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/opensc/files/patch-winscard.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/configure.ac b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/configure.ac
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -808,7 +808,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ saved_CFLAGS="${CFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${CFLAGS} ${PCSC_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # We must cope with mingw32 that does not have winscard.h mingw64 has it.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- AC_CHECK_HEADERS([winscard.h],,[test "${WIN32}" != "yes" && AC_MSG_ERROR([winscard.h is required for pcsc])])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ AC_CHECK_HEADERS([winscard.h],,[test "${WIN32}" != "yes" && AC_MSG_ERROR([winscard.h is required for pcsc])],[#include <pcsclite.h>])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ AC_CHECK_HEADERS([pcsclite.h])
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CFLAGS="${saved_CFLAGS}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libopensc/internal-winscard.h b/src/libopensc/internal-winscard.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libopensc/internal-winscard.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libopensc/internal-winscard.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -46,6 +46,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_WINSCARD_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <pcsclite.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <winscard.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <wintypes.h>
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/security/opensc/files/patch-xcode10.diff b/security/opensc/files/patch-xcode10.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..d5fe5c7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/security/opensc/files/patch-xcode10.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,37 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/libopensc/internal-winscard.h b/src/libopensc/internal-winscard.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 011167ddc..edc315ca2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/src/libopensc/internal-winscard.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/src/libopensc/internal-winscard.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -138,6 +138,7 @@ typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* HAVE_SCARD_H */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef PCSC_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(_WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PCSC_API WINAPI
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif defined(USE_CYGWIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -145,6 +146,12 @@ typedef const SCARD_IO_REQUEST *LPCSCARD_IO_REQUEST;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define PCSC_API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define extern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define __attribute__(a)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef LONG (PCSC_API *SCardEstablishContext_t)(DWORD dwScope, LPCVOID pvReserved1,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LPCVOID pvReserved2, LPSCARDCONTEXT phContext);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -174,6 +181,11 @@ typedef LONG (PCSC_API *SCardListReaders_t)(SCARDCONTEXT hContext, LPCSTR mszGro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef LONG (PCSC_API *SCardGetAttrib_t)(SCARDHANDLE hCard, DWORD dwAttrId,\
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LPBYTE pbAttr, LPDWORD pcbAttrLen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef extern
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef __attribute__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Copied from pcsc-lite reader.h */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifndef SCARD_CTL_CODE
</span></pre><pre style='margin:0'>
</pre>