<pre style='margin:0'>
David B. Evans (dbevans) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/c22b48d786330cbf539426ef461aef27ef78ea84">https://github.com/macports/macports-ports/commit/c22b48d786330cbf539426ef461aef27ef78ea84</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 c22b48d  gimp2-devel: additional 10.6 build fix
</span>c22b48d is described below

<span style='display:block; white-space:pre;color:#808000;'>commit c22b48d786330cbf539426ef461aef27ef78ea84
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Oct 28 12:30:15 2018 -0700

<span style='display:block; white-space:pre;color:#404040;'>    gimp2-devel: additional 10.6 build fix
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    On 10.6 and earlier when GDK_WINDOWING_X11 and PLATFORM_OSX
</span><span style='display:block; white-space:pre;color:#404040;'>    are defined simultaneously (e.g. +x11), there is
</span><span style='display:block; white-space:pre;color:#404040;'>    potential for a typedef conflict between X11 and Quickdraw.
</span><span style='display:block; white-space:pre;color:#404040;'>    In the case where this occurs, #undef PLATFORM_OSX if
</span><span style='display:block; white-space:pre;color:#404040;'>    GDK_WINDOWING_X11 is defined.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    In otherwords, if building for X11 use the X11 API exclusively
</span><span style='display:block; white-space:pre;color:#404040;'>    even if we are building on OSX.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    error: typedef redefinition with different types ('struct Cursor' vs 'XID' (aka 'unsigned long'))
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    See: https://trac.macports.org/ticket/57334
</span>---
 graphics/gimp2-devel/Portfile                         |  8 ++++++++
 graphics/gimp2-devel/files/patch-x11-widgets-fix.diff | 12 ++++++++++++
 2 files changed, 20 insertions(+)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/Portfile b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index ba94021..60776d4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,6 +97,14 @@ patchfiles          patch-configure.ac.diff \
</span>                     patch-etc-gimprc.in.diff \
                     patch-quartz-32bit.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${os.platform} eq "darwin" && ${os.major} < 11} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # avoid Cursor type conflict between X11 and Quickdraw
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # error: typedef redefinition with different types ('struct Cursor' vs 'XID' (aka 'unsigned long'))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # not an issue on 10.7 and later
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    patch-x11-widgets-fix.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> pre-configure {
     if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
         set gtk_not_quartz [catch {exec grep -q GDK_WINDOWING_QUARTZ ${prefix}/lib/gtk-2.0/include/gdkconfig.h}]
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/files/patch-x11-widgets-fix.diff b/graphics/gimp2-devel/files/patch-x11-widgets-fix.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..381eede
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/files/patch-x11-widgets-fix.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpwidgets-utils.c.orig   2018-10-28 11:17:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpwidgets-utils.c        2018-10-28 11:18:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -31,6 +31,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef GDK_WINDOWING_X11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <gdk/gdkx.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef PLATFORM_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#undef PLATFORM_OSX
</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 PLATFORM_OSX
</span></pre><pre style='margin:0'>

</pre>