<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/78ea82f13c5e33a60e2ec6040f364bce9e166c6f">https://github.com/macports/macports-ports/commit/78ea82f13c5e33a60e2ec6040f364bce9e166c6f</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 78ea82f13c5 gimp2-devel: update to version 2.10.21 branch gimp-2-10 as of 20200829
</span>78ea82f13c5 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 78ea82f13c5e33a60e2ec6040f364bce9e166c6f
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Sat Aug 29 17:17:26 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gimp2-devel: update to version 2.10.21 branch gimp-2-10 as of 20200829
</span>---
graphics/gimp2-devel/Portfile | 18 +++++++++++-------
graphics/gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch | 12 ++++++------
graphics/gimp2-devel/files/patch-etc-gimprc.in.diff | 8 ++++----
graphics/gimp2-devel/files/patch-mach-task-info.diff | 8 ++++----
graphics/gimp2-devel/files/patch-quartz-32bit.diff | 4 ++--
5 files changed, 27 insertions(+), 23 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 f8cadf8b163..ec345e95ce0 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,10 @@ PortGroup perl5 1.0
</span> name gimp2-devel
conflicts gimp2 gimp3-devel
set git_name gimp
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_commit 3f9cd9b435a483ebe2e58e800fd294ead4cbe2cb
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set git_date 20200223
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.10.19-${git_date}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_commit d2e1596fed960ce759216c60ad3d77e6d29f43c7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set git_date 20200829
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 2.10.21-${git_date}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> license GPL-3+
categories graphics
maintainers {devans @dbevans}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -30,9 +30,12 @@ distname ${git_name}-${git_commit}
</span>
use_bzip2 yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 cbf1d9fe9d007acd638ee0e77506ab7f1439e95a \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 5cb0e01b1288ae9d5fc9c96b70ef4e4d3b393c4cbc40b1ae93aecdeee421cc9d \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 82811146
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 8464e2669be309ce609306cdc7b717f5adca6e2b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 efff7b33c4ff900ef8cf6a21cd75b97dbb1202e391ac735b8285ccc98fa812b6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 82951317
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# force default perl to match intltool
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+perl5.branches 5.28
</span>
depends_build port:pkgconfig \
port:appstream-glib \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,6 +149,7 @@ configure.args --build=${configure.build_arch}-apple-${os.platform}${os.ver
</span> --x-libraries=${prefix}/lib \
--disable-silent-rules \
--disable-python \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-check-update \
</span> --without-alsa \
--without-gudev \
--without-webkit \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch b/graphics/gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 18cf261a961..aa604319d54 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/files/MYPAINT_BRUSHES_DIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,29 +5,29 @@ See: https://github.com/mypaint/mypaint-brushes/issues/5
</span> +++ app/config/gimpcoreconfig.c 2020-06-02 21:37:55.000000000 -0500
@@ -51,6 +51,9 @@
#include "gimp-intl.h"
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +#define _QUOTE(x) #x
+#define QUOTE(x) _QUOTE(x)
+
#define GIMP_DEFAULT_BRUSH "2. Hardness 050"
#define GIMP_DEFAULT_DYNAMICS "Dynamics Off"
#define GIMP_DEFAULT_PATTERN "Pine"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -313,7 +316,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -314,7 +317,7 @@
</span> "share", "mypaint-data",
"1.0", "brushes", NULL);
#else
- mypaint_brushes = g_strdup (MYPAINT_BRUSHES_DIR);
+ mypaint_brushes = g_strdup (QUOTE(MYPAINT_BRUSHES_DIR));
#endif
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> path = g_build_path (G_SEARCHPATH_SEPARATOR_S,
--- app/core/gimpdata.c.orig 2020-02-23 12:21:08.000000000 -0600
+++ app/core/gimpdata.c 2020-06-02 21:38:28.000000000 -0500
@@ -36,6 +36,9 @@
#include "gimp-intl.h"
<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:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> +#define _QUOTE(x) #x
+#define QUOTE(x) _QUOTE(x)
+
<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 06ab8427938..5eab0417a24 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 2020-02-23 10:21:08.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ etc/gimprc.in 2020-02-23 13:19:29.000000000 -0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -821,11 +821,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- etc/gimprc.in.orig 2020-02-16 07:04:57.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ etc/gimprc.in 2020-02-22 17:04:36.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -831,11 +831,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;'>-@@ -852,6 +854,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -862,6 +864,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-mach-task-info.diff b/graphics/gimp2-devel/files/patch-mach-task-info.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index b890e04048c..0f189e6ce74 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/files/patch-mach-task-info.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2-devel/files/patch-mach-task-info.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,7 +1,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- app/widgets/gimpdashboard.c.orig 2020-08-29 17:02:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ app/widgets/gimpdashboard.c 2020-08-29 17:55:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2398,6 +2398,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpdashboard.c.orig 2020-08-29 07:35:18.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpdashboard.c 2020-08-29 16:21:26.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2420,6 +2420,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> #ifdef HAVE_MEMORY_GROUP
#ifdef PLATFORM_OSX
+ #if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
<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><span style='display:block; white-space:pre;color:#808080;'>index 825b047dacf..17f7c3f2d93 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp2-devel/files/patch-quartz-32bit.diff
</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;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- libgimpwidgets/gimppickbutton-quartz.c.orig 2019-05-09 09:42:29.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ libgimpwidgets/gimppickbutton-quartz.c 2019-05-09 17:34:22.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- libgimpwidgets/gimppickbutton-quartz.c.orig 2019-04-07 04:38:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ libgimpwidgets/gimppickbutton-quartz.c 2019-04-12 14:45:21.000000000 -0700
</span> @@ -59,6 +59,10 @@
{
GimpPickButton *button;
</pre><pre style='margin:0'>
</pre>