<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/d555ff30a31fe91e49905e59c260e22f74bc8119">https://github.com/macports/macports-ports/commit/d555ff30a31fe91e49905e59c260e22f74bc8119</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 d555ff3  gimp3-devel: merge additional build fixes from gimp2-devel
</span>d555ff3 is described below

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

<span style='display:block; white-space:pre;color:#404040;'>    gimp3-devel: merge additional build fixes from gimp2-devel
</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/gimp3-devel/Portfile                        | 20 +++++++++++++++++++-
 .../gimp3-devel/files/patch-x11-widgets-fix.diff     | 12 ++++++++++++
 2 files changed, 31 insertions(+), 1 deletion(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/Portfile b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 002a9e1..d7191e3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -100,6 +100,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;background:#e0e0e0;'>@@ -116,6 +124,17 @@ pre-configure {
</span> 
 configure.perl      ${prefix}/bin/perl${perl_version}
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.env       CC_FOR_BUILD=${configure.cc}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {[vercmp $xcodeversion 4.3] < 0 && [string match "*macports*" ${configure.compiler}]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    # Xcode 4.2 fails with load commands in the newer toolchain
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    depends_build-append port:cctools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    configure.env-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        AR=${prefix}/bin/ar \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        RANLIB=${prefix}/bin/ranlib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.cmd       ./autogen.sh
 
 configure.args      --build=${configure.build_arch}-apple-${os.platform}${os.version} \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -132,7 +151,6 @@ configure.args      --build=${configure.build_arch}-apple-${os.platform}${os.ver
</span>                     --without-gudev \
                     --without-webkit \
                     ac_cv_path_INTLTOOL_PERL=${configure.perl}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env       CC_FOR_BUILD=${configure.cc}
</span> 
 # keep empty GIMP font directory
 # silences warning message on startup:
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp3-devel/files/patch-x11-widgets-fix.diff b/graphics/gimp3-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/gimp3-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>