<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3dd0bfb44f73de4f8bd29856dad484b9a1824ba3">https://github.com/macports/macports-ports/commit/3dd0bfb44f73de4f8bd29856dad484b9a1824ba3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3dd0bfb44f73de4f8bd29856dad484b9a1824ba3
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Nov 10 08:23:05 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> tkdnd: fix memory management flags
</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/59058
</span>---
x11/tkdnd/Portfile | 25 +++++++++++++++++--------
x11/tkdnd/files/patch-CMakeLists.txt.diff | 11 +++++++----
2 files changed, 24 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tkdnd/Portfile b/x11/tkdnd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a6054e..ee4631f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tkdnd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tkdnd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span> PortGroup cmake 1.1
PortGroup active_variants 1.1
PortGroup github 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup compiler_blacklist_versions 1.0
</span>
github.setup petasis tkdnd tkdnd-release-test-v2.9.1
version 2.9
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,19 +35,27 @@ configure.args-append \
</span> depends_lib-append port:tcl \
port:tk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # garbage collection still available
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|#MACPORTS_USE_GC||g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant quartz conflicts x11 {
require_active_variants tk quartz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # garbage collection is still available for ${os.major} < 16
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # ARC is available for ${os.major} > 10
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # in Xcode < 10, ARC forbids Objective-C objects in struct
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://developer.apple.com/videos/play/wwdc2018/409/?time=229
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/59058
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} >= 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ compiler.blacklist-append {clang < 1000}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> post-patch {
reinplace "s|MACPORTS_APPLE|APPLE|g" \
${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {${os.major} < 16} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#MACPORTS_DO_NOT_USE_GC||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|#MACPORTS_DO_NOT_USE_ARC||g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/x11/tkdnd/files/patch-CMakeLists.txt.diff b/x11/tkdnd/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index fa2082b..cf02293 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/x11/tkdnd/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/x11/tkdnd/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span> --- CMakeLists.txt.orig 2018-09-01 08:59:26.000000000 -0700
+++ CMakeLists.txt 2018-09-01 09:01:19.000000000 -0700
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,18 +42,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -62,20 +62,15 @@
</span>
ELSE ( WIN32 )
## Unix and OS X...
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,10 @@
</span> ADD_DEFINITIONS ( -std=gnu99 )
ADD_DEFINITIONS ( -x objective-c )
- ADD_DEFINITIONS ( -fobjc-gc )
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+#MACPORTS_USE_GC ADD_DEFINITIONS ( -fobjc-gc )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS ( -fno-objc-arc )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # ADD_DEFINITIONS ( -fobjc-arc )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ADD_DEFINITIONS ( -fno-objc-arc )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ADD_DEFINITIONS ( -fobjc-arc )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#MACPORTS_DO_NOT_USE_GC ADD_DEFINITIONS ( -fobjc-gc )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#MACPORTS_DO_NOT_USE_ARC ADD_DEFINITIONS ( -fobjc-arc )
</span> LINK_LIBRARIES ( ${COCOA_LIBRARY} )
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET ( PKG_SOURCES macosx/macdnd.m )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ELSE ( APPLE )
</span></pre><pre style='margin:0'>
</pre>