<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/ee302d79df14f9de9c041a58b4e1c57d304cb9e0">https://github.com/macports/macports-ports/commit/ee302d79df14f9de9c041a58b4e1c57d304cb9e0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ee302d79df14f9de9c041a58b4e1c57d304cb9e0
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Tue Jul 24 11:55:12 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp2-devel: update to version 2.10.5 maintenance branch as of 20180723
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * fetch from new GNOME Gitlab repository
</span><span style='display:block; white-space:pre;color:#404040;'> * apply 32-bit quartz patch from gimp2
</span>---
graphics/gimp2-devel/Portfile | 20 ++++++++------
.../patch-app-widgets-gimpcriticaldialog.c.diff | 6 ++--
graphics/gimp2-devel/files/patch-configure.ac.diff | 8 +++---
.../gimp2-devel/files/patch-etc-gimprc.in.diff | 10 +++----
graphics/gimp2-devel/files/patch-quartz-32bit.diff | 32 ++++++++++++++++++++++
5 files changed, 55 insertions(+), 21 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/Portfile b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7770e70..ea8fff4 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,10 +7,9 @@ PortGroup cxx11 1.1
</span> name gimp2-devel
conflicts gimp2 gimp3-devel
set git_name gimp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit a48d9178e8a0cec6f828f70a27755e4fd0812980
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20180521
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.10.3-${git_date}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit c582023ef521c1991a30eafc664b51581709fdde
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20180723
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.5-${git_date}
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,13 +24,15 @@ long_description The GNU Image Manipulation Program (GIMP) is a powerful \
</span> based on a recent snapshot of upstream branch gimp-2-10.
homepage http://www.gimp.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://git.gnome.org/browse/${git_name}/snapshot/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites https://gitlab.gnome.org/GNOME/${git_name}/-/archive/${git_commit}/
</span>
distname ${git_name}-${git_commit}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2b01d11f09cd68899ee938a51eaaf0a2731ff826 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 221e7012a565bd0c26e232c776956d645caa7ccb263e7a314230db8e78c707b2 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 90783650
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 480fd2c14b4b3262989628f91e965a17bb932109 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 24c6bffb3efeed75100ff356e7c2e25413b8eed4e1636641683cf2ba218a15ce \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 81578901
</span>
set perl_version 5.26
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -94,7 +95,8 @@ compiler.blacklist *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>
pre-configure {
if {[file exists ${prefix}/lib/gtk-2.0/include/gdkconfig.h]} {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/files/patch-app-widgets-gimpcriticaldialog.c.diff b/graphics/gimp2-devel/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5559992..299816b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/files/patch-app-widgets-gimpcriticaldialog.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/files/patch-app-widgets-gimpcriticaldialog.c.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;'>---- app/widgets/gimpcriticaldialog.c.orig 2018-05-01 13:13:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/widgets/gimpcriticaldialog.c 2018-05-01 13:18:07.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -272,26 +272,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpcriticaldialog.c.orig 2018-07-23 09:25:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpcriticaldialog.c 2018-07-23 22:07:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -274,26 +274,25 @@
</span>
return TRUE;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/files/patch-configure.ac.diff b/graphics/gimp2-devel/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b08d378..98abe80 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/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-05-21 06:47:53.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2018-05-21 11:30:36.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -758,7 +758,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.ac.orig 2018-07-23 09:25:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure.ac 2018-07-23 22:07:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -764,7 +764,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;'>-@@ -2040,7 +2040,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2064,7 +2064,7 @@
</span> # Check for perl
################
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/files/patch-etc-gimprc.in.diff b/graphics/gimp2-devel/files/patch-etc-gimprc.in.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5744ef3..0bc767f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/files/patch-etc-gimprc.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/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-03-26 16:15:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/gimprc.in 2018-04-16 14:10:23.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -747,11 +747,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- etc/gimprc.in.orig 2018-07-23 09:25:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ etc/gimprc.in 2018-07-23 22:07:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -752,11 +752,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;'>-@@ -767,6 +769,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -772,6 +774,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;'>-@@ -778,6 +781,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -783,6 +786,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-devel/files/patch-quartz-32bit.diff b/graphics/gimp2-devel/files/patch-quartz-32bit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..3253259
</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-devel/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-07-23 09:25:57.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgimpwidgets/gimppickbutton-quartz.c 2018-07-23 22:07:29.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>