<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/25e693e4d1a2d85095d5333edf02b46337f07db5">https://github.com/macports/macports-ports/commit/25e693e4d1a2d85095d5333edf02b46337f07db5</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 25e693e4d1a2d85095d5333edf02b46337f07db5
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sun Oct 28 14:22:24 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp2: backport build fixes as implemented upstream
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Misc fixes for 10.6, 10.7, previously implemented as
</span><span style='display:block; white-space:pre;color:#404040;'> separate patches. This should be removed with the release
</span><span style='display:block; white-space:pre;color:#404040;'> of gimp2 2.10.8.
</span>---
graphics/gimp2/Portfile | 4 +-
graphics/gimp2/files/CoreGraphics.patch | 14 ----
...ndowCollectionBehaviorFullScreenAuxiliary.patch | 28 --------
graphics/gimp2/files/convertRectToScreen.patch | 26 -------
graphics/gimp2/files/upstream-build-fixes.patch | 81 ++++++++++++++++++++++
5 files changed, 82 insertions(+), 71 deletions(-)
<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 f915b6b..273b0b8 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;'>@@ -91,9 +91,7 @@ compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
</span> patchfiles patch-configure.ac.diff \
patch-etc-gimprc.in.diff \
patch-quartz-32bit.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- convertRectToScreen.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CoreGraphics.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSWindowCollectionBehaviorFullScreenAuxiliary.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ upstream-build-fixes.patch
</span>
use_autoreconf yes
autoreconf.args -fvi
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/CoreGraphics.patch b/graphics/gimp2/files/CoreGraphics.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0a0d8b7..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/CoreGraphics.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,14 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Include ApplicationServices instead of CoreGraphics.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-CoreGraphics didn't become a top-level framework until OS X 10.8.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/gimp/issues/2113
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- app/widgets/gimpwidgets-utils.c.orig 2018-08-19 11:47:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/widgets/gimpwidgets-utils.c 2018-08-26 22:39:51.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,7 +34,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef PLATFORM_OSX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <CoreGraphics/CoreGraphics.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <ApplicationServices/ApplicationServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "libgimpbase/gimpbase.h"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/NSWindowCollectionBehaviorFullScreenAuxiliary.patch b/graphics/gimp2/files/NSWindowCollectionBehaviorFullScreenAuxiliary.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2390208..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/NSWindowCollectionBehaviorFullScreenAuxiliary.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,28 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add definition of NSWindowCollectionBehaviorFullScreenAuxiliary for 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/gimp/issues/2112
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- app/display/gimpimagewindow.c.orig 2018-08-19 11:47:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/display/gimpimagewindow.c 2018-08-26 22:11:29.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -94,6 +94,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* Whether the window's maximized or not */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define GIMP_IMAGE_WINDOW_MAXIMIZED "maximized"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define NSWindowCollectionBehaviorFullScreenAuxiliary (1 << 8)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- enum
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -633,12 +637,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * as soon as GTK+ has proper support for this, we will migrate to the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * new-style full screen mode.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ns_window.collectionBehavior |= NSWindowCollectionBehaviorFullScreenAuxiliary;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- /* Hard code the define ... */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ns_window.collectionBehavior |= 1 << 8;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif /* !GDK_WINDOWING_QUARTZ */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/convertRectToScreen.patch b/graphics/gimp2/files/convertRectToScreen.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b6f5251..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/convertRectToScreen.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Add implementation of NSWindow convertRectToScreen for 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-https://gitlab.gnome.org/GNOME/gimp/issues/2112
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgimpwidgets/gimppickbutton-quartz.c.orig 2018-08-26 21:17:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgimpwidgets/gimppickbutton-quartz.c 2018-08-26 22:16:25.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -34,6 +34,21 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <ApplicationServices/ApplicationServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@interface NSWindow (GIMPExt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (NSRect) convertRectToScreen: (NSRect)aRect;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@implementation NSWindow (GIMPExt)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+- (NSRect) convertRectToScreen: (NSRect)aRect
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSRect result = aRect;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ NSPoint origin = result.origin;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ result.origin = [self convertBaseToScreen:origin];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return result;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+@end
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @interface GimpPickWindowController : NSObject
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/upstream-build-fixes.patch b/graphics/gimp2/files/upstream-build-fixes.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..530258c
</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/upstream-build-fixes.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,81 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 7dbb9fee3dab94c87cf215a8b903c7a1538209a2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Oleksii Samorukov <samm@os2.kiev.ua>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 24 Oct 2018 10:37:36 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Fix compilation on Mac 10.6 and 10.7 (#2112)
</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;'>+ app/display/gimpimagewindow.c | 9 ++++-----
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ app/widgets/gimpwidgets-utils.c | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ libgimpwidgets/gimppickbutton-quartz.c | 15 +++++++++++++++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 3 files changed, 20 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 8fd598d91f..9defe164fc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/display/gimpimagewindow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/display/gimpimagewindow.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -94,6 +94,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* Whether the window's maximized or not */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define GIMP_IMAGE_WINDOW_MAXIMIZED "maximized"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define NSWindowCollectionBehaviorFullScreenAuxiliary (1 << 8)
</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;'>+ enum
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -633,12 +637,7 @@ gimp_image_window_map (GtkWidget *widget)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * as soon as GTK+ has proper support for this, we will migrate to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * new-style full screen mode.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if MAC_OS_X_VERSION_MIN_REQUIRED >= MAC_OS_X_VERSION_10_7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ns_window.collectionBehavior |= NSWindowCollectionBehaviorFullScreenAuxiliary;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /* Hard code the define ... */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ns_window.collectionBehavior |= 1 << 8;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif /* !GDK_WINDOWING_QUARTZ */
</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;'>+diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 53725d10e5..529a453fef 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpwidgets-utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpwidgets-utils.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,7 +34,7 @@
</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><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <CoreGraphics/CoreGraphics.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <ApplicationServices/ApplicationServices.h>
</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;'>+ #include "libgimpbase/gimpbase.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/libgimpwidgets/gimppickbutton-quartz.c b/libgimpwidgets/gimppickbutton-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 0e676fe94a..3da42b59a4 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgimpwidgets/gimppickbutton-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgimpwidgets/gimppickbutton-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34,6 +34,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <ApplicationServices/ApplicationServices.h>
</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;'>++#if MAC_OS_X_VERSION_MAX_ALLOWED < 1070
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@interface NSWindow (GIMPExt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (NSRect) convertRectToScreen: (NSRect)aRect;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@end
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@implementation NSWindow (GIMPExt)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++- (NSRect) convertRectToScreen: (NSRect)aRect
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSRect result = aRect;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NSPoint origin = result.origin;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ result.origin = [self convertBaseToScreen:origin];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return result;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++@end
</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;'>+ @interface GimpPickWindowController : NSObject
</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;'>+2.18.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>