<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/b9c3977e5447f5a26f2c5615eea40442f1262208">https://github.com/macports/macports-ports/commit/b9c3977e5447f5a26f2c5615eea40442f1262208</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b9c3977e5447f5a26f2c5615eea40442f1262208
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Oct 28 17:07:05 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp2: 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;'> Closes https://trac.macports.org/ticket/57334.
</span>---
graphics/gimp2/Portfile | 21 ++++++++++++++++++++-
graphics/gimp2/files/patch-x11-widgets-fix.diff | 12 ++++++++++++
2 files changed, 32 insertions(+), 1 deletion(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/Portfile b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 273b0b8..5c223d3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -93,6 +93,14 @@ patchfiles patch-configure.ac.diff \
</span> patch-quartz-32bit.diff \
upstream-build-fixes.patch
<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> use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -111,6 +119,18 @@ pre-configure {
</span> }
configure.perl ${prefix}/bin/perl${perl_version}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><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.args --build=${configure.build_arch}-apple-${os.platform}${os.version} \
--enable-mp \
--enable-binreloc-threads \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -125,7 +145,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/gimp2/files/patch-x11-widgets-fix.diff b/graphics/gimp2/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/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>