<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/239620348f4bd7f0328e04969b633690620a348d">https://github.com/macports/macports-ports/commit/239620348f4bd7f0328e04969b633690620a348d</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 2396203 gimp2, gimp: update to version 2.10.8
</span>2396203 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 239620348f4bd7f0328e04969b633690620a348d
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Nov 13 22:43:59 2018 -0800
<span style='display:block; white-space:pre;color:#404040;'> gimp2, gimp: update to version 2.10.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Drop upstream patch now included in tarball.
</span>---
graphics/gimp/Portfile | 2 +-
graphics/gimp2/Portfile | 12 ++--
graphics/gimp2/files/patch-configure.ac.diff | 8 +--
graphics/gimp2/files/patch-etc-gimprc.in.diff | 10 +--
graphics/gimp2/files/patch-quartz-32bit.diff | 10 +--
graphics/gimp2/files/upstream-build-fixes.patch | 81 -------------------------
6 files changed, 20 insertions(+), 103 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp/Portfile b/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 228ac06..8283999 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,7 +3,7 @@
</span> PortSystem 1.0
name gimp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.10.6
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.8
</span> license none
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
<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 99c4dd1..024bfd9 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;'>@@ -7,8 +7,7 @@ PortGroup cxx11 1.1
</span> name gimp2
conflicts gimp2-devel gimp3-devel
# please remember to update the gimp metapackage to match
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.10.6
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.8
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -28,9 +27,9 @@ distname gimp-${version}
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ad8f381e837ad305a7d52a2da0d8a8c422e7d98b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4ec8071f828e918384cf7bc7d1219210467c84655123f802bc55a8bf2415101f \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 31447973
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 6ba70462096cc79c80c4e5bcb8abfe3c339542d6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 d849c1cf35244938ae82e521b92b720ab48b8e9ed092d5de92c2464ef5244b9b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 31954568
</span>
set perl_version 5.26
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -90,8 +89,7 @@ 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:#ffe0e0;'>- upstream-build-fixes.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-quartz-32bit.diff
</span>
if {${os.platform} eq "darwin" && ${os.major} < 11} {
# avoid Cursor type conflict between X11 and Quickdraw
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-configure.ac.diff b/graphics/gimp2/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index c1c03fa..888a7f9 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2018-08-19 09:47:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-08-21 14:53:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -778,7 +778,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-11-08 05:58:50.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-11-13 00:53:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -798,7 +798,7 @@
</span> fi
AC_MSG_RESULT($have_glib_2_43)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@
</span> if test "x$GEGL" = xno; then
add_deps_error([gegl], [Could not find native gegl executable in your PATH.])
fi
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2131,7 +2131,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2241,7 +2241,7 @@
</span> # Check for perl
################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/patch-etc-gimprc.in.diff b/graphics/gimp2/files/patch-etc-gimprc.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 9a12b03..807b0f3 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-etc-gimprc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/files/patch-etc-gimprc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- etc/gimprc.in.orig 2018-08-19 09:47:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/gimprc.in 2018-08-21 14:53:08.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -758,11 +758,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- etc/gimprc.in.orig 2018-11-08 05:58:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ etc/gimprc.in 2018-11-13 00:53:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -762,11 +762,13 @@
</span> # string value.
#
# (help-locales "")
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +14,7 @@
</span>
# When enabled, a search of actions will also return inactive actions.
# Possible values are yes and no.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -778,6 +780,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -782,6 +784,7 @@
</span> # no.
#
# (user-manual-online no)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,7 +22,7 @@
</span>
# The location of the online user manual. This is used if
# 'user-manual-online' is enabled. This is a string value.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -789,6 +792,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -793,6 +796,7 @@
</span> # windows. Possible values are normal, utility and keep-above.
#
# (dock-window-hint utility)
<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><span style='display:block; white-space:pre;color:#808080;'>index 9d8868d..6ac5b53 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/patch-quartz-32bit.diff
</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;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgimpwidgets/gimppickbutton-quartz.c.orig 2018-03-26 14:43:59.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgimpwidgets/gimppickbutton-quartz.c 2018-05-13 10:08:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -39,6 +39,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgimpwidgets/gimppickbutton-quartz.c.orig 2018-11-08 05:58:41.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgimpwidgets/gimppickbutton-quartz.c 2018-11-13 00:53:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,6 +54,10 @@
</span> {
GimpPickButton *button;
NSMutableArray *windows;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@
</span> }
@property (nonatomic, assign) BOOL firstBecameKey;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -53,6 +57,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -68,6 +72,9 @@
</span> {
GimpPickButton *button;
GimpPickWindowController *controller;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,7 +21,7 @@
</span> }
@property (readonly,assign) NSTrackingArea *area;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -177,7 +184,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -192,7 +199,7 @@
</span> rect = [self.window convertRectToScreen:rect];
rect.origin.y = [[[NSScreen screens] objectAtIndex:0] frame].size.height - rect.origin.y;
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 530258c..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2/files/upstream-build-fixes.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,81 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 7dbb9fee3dab94c87cf215a8b903c7a1538209a2 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Oleksii Samorukov <samm@os2.kiev.ua>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 24 Oct 2018 10:37:36 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Fix compilation on Mac 10.6 and 10.7 (#2112)
</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;'>- app/display/gimpimagewindow.c | 9 ++++-----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- app/widgets/gimpwidgets-utils.c | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- libgimpwidgets/gimppickbutton-quartz.c | 15 +++++++++++++++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 3 files changed, 20 insertions(+), 6 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/app/display/gimpimagewindow.c b/app/display/gimpimagewindow.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 8fd598d91f..9defe164fc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- app/display/gimpimagewindow.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/display/gimpimagewindow.c
</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 @@ gimp_image_window_map (GtkWidget *widget)
</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;background:#ffe0e0;'>-diff --git a/app/widgets/gimpwidgets-utils.c b/app/widgets/gimpwidgets-utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 53725d10e5..529a453fef 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- app/widgets/gimpwidgets-utils.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/widgets/gimpwidgets-utils.c
</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;background:#ffe0e0;'>-diff --git a/libgimpwidgets/gimppickbutton-quartz.c b/libgimpwidgets/gimppickbutton-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0e676fe94a..3da42b59a4 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgimpwidgets/gimppickbutton-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgimpwidgets/gimppickbutton-quartz.c
</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;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-2.18.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>