<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d4a99bd97f597db0f43171593f76c0139d582cbe">https://github.com/macports/macports-ports/commit/d4a99bd97f597db0f43171593f76c0139d582cbe</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 d4a99bd gimp2: Add patches for 10.6 build failures
</span>d4a99bd is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d4a99bd97f597db0f43171593f76c0139d582cbe
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Oct 9 21:49:00 2018 -0500
<span style='display:block; white-space:pre;color:#404040;'> gimp2: Add patches for 10.6 build failures
</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/57035
</span>---
graphics/gimp2/Portfile | 5 +++-
graphics/gimp2/files/CoreGraphics.patch | 14 +++++++++++
...ndowCollectionBehaviorFullScreenAuxiliary.patch | 28 ++++++++++++++++++++++
graphics/gimp2/files/convertRectToScreen.patch | 26 ++++++++++++++++++++
4 files changed, 72 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 a62ef78..f915b6b 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;'>@@ -90,7 +90,10 @@ 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-quartz-32bit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-quartz-32bit.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ convertRectToScreen.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CoreGraphics.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSWindowCollectionBehaviorFullScreenAuxiliary.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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..0a0d8b7
</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/CoreGraphics.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Include ApplicationServices instead of CoreGraphics.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+CoreGraphics didn't become a top-level framework until OS X 10.8.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/gimp/issues/2113
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpwidgets-utils.c.orig 2018-08-19 11:47:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpwidgets-utils.c 2018-08-26 22:39:51.000000000 -0500
</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;color:#808080;'>diff --git a/graphics/gimp2/files/NSWindowCollectionBehaviorFullScreenAuxiliary.patch b/graphics/gimp2/files/NSWindowCollectionBehaviorFullScreenAuxiliary.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..2390208
</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/NSWindowCollectionBehaviorFullScreenAuxiliary.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,28 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add definition of NSWindowCollectionBehaviorFullScreenAuxiliary for 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/gimp/issues/2112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/display/gimpimagewindow.c.orig 2018-08-19 11:47:18.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/display/gimpimagewindow.c 2018-08-26 22:11:29.000000000 -0500
</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 @@
</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;color:#808080;'>diff --git a/graphics/gimp2/files/convertRectToScreen.patch b/graphics/gimp2/files/convertRectToScreen.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..b6f5251
</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/convertRectToScreen.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add implementation of NSWindow convertRectToScreen for 10.6 and earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://gitlab.gnome.org/GNOME/gimp/issues/2112
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgimpwidgets/gimppickbutton-quartz.c.orig 2018-08-26 21:17:21.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgimpwidgets/gimppickbutton-quartz.c 2018-08-26 22:16:25.000000000 -0500
</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></pre><pre style='margin:0'>
</pre>