<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/9e1403c921ef031c0fb5448ad607c7396ecaf810">https://github.com/macports/macports-ports/commit/9e1403c921ef031c0fb5448ad607c7396ecaf810</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 9e1403c921ef031c0fb5448ad607c7396ecaf810
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Wed Aug 16 15:10:13 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> webkit2-gtk: fix name collision "Cursor" between X11 and QuickDraw
</span>---
www/webkit2-gtk/Portfile | 5 +++++
.../patch-snowleopard-npruntime-redefine-cursor.diff | 17 +++++++++++++++++
2 files changed, 22 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/Portfile b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 14dbc77..3f03214 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,6 +167,11 @@ if {${os.platform} eq "darwin" && ${os.major} < 13} {
</span> # https://trac.macports.org/ticket/52016
patchfiles-append patch-snowleopard-cmakelists-stdcformatmacros.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # fix a Cursor name collision with Carbon API
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # https://trac.macports.org/ticket/52016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-snowleopard-npruntime-redefine-cursor.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant quartz conflicts x11 gtk2 {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/www/webkit2-gtk/files/patch-snowleopard-npruntime-redefine-cursor.diff b/www/webkit2-gtk/files/patch-snowleopard-npruntime-redefine-cursor.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5a62ef0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/www/webkit2-gtk/files/patch-snowleopard-npruntime-redefine-cursor.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,17 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Source/WebCore/bridge/npruntime_internal.h.orig 2017-08-14 21:56:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Source/WebCore/bridge/npruntime_internal.h 2017-08-14 21:57:40.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -30,8 +30,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "npruntime.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(MOZ_X11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define Cursor QD_Cursor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <X11/Xresource.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// should there be...?
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++// #undef Cursor
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef None
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef Above
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #undef Below
</span></pre><pre style='margin:0'>
</pre>