<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/f2a332c5b0c92bb0e6759d4b2867966f7f0128cb">https://github.com/macports/macports-ports/commit/f2a332c5b0c92bb0e6759d4b2867966f7f0128cb</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit f2a332c5b0c92bb0e6759d4b2867966f7f0128cb
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Jun 17 08:17:35 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp2: allow 32-bit build with quartz variant
</span>---
graphics/gimp2/Portfile | 3 ++-
graphics/gimp2/files/patch-quartz-32bit.diff | 32 ++++++++++++++++++++++++++++
2 files changed, 34 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 3da6baf..889ea26 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;'>@@ -92,7 +92,8 @@ compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
</span>
patchfiles patch-configure.ac.diff \
patch-etc-gimprc.in.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-app-widgets-gimpcriticaldialog.c.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-app-widgets-gimpcriticaldialog.c.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-quartz-32bit.diff
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-quartz-32bit.diff b/graphics/gimp2/files/patch-quartz-32bit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..9d8868d
</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-quartz-32bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,32 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgimpwidgets/gimppickbutton-quartz.c.orig 2018-03-26 14:43:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgimpwidgets/gimppickbutton-quartz.c 2018-05-13 10:08:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -39,6 +39,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GimpPickButton *button;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSMutableArray *windows;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ BOOL firstBecameKey;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSCursor *cursor;
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property (nonatomic, assign) BOOL firstBecameKey;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -53,6 +57,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GimpPickButton *button;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GimpPickWindowController *controller;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifndef __LP64__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSTrackingArea *area;
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @property (readonly,assign) NSTrackingArea *area;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -177,7 +184,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rect = [self.window convertRectToScreen:rect];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rect.origin.y = [[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.origin.y;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- root_image_ref = CGWindowListCreateImage (rect,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ root_image_ref = CGWindowListCreateImage (NSRectToCGRect(rect),
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCGWindowListOptionOnScreenOnly,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCGNullWindowID,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ kCGWindowImageDefault);
</span></pre><pre style='margin:0'>
</pre>