<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/8139855119740a50ff639c83fbd22a4804743de8">https://github.com/macports/macports-ports/commit/8139855119740a50ff639c83fbd22a4804743de8</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 81398551197 gimp2{,-devel}: add patch to fix building on <= 10.7
</span>81398551197 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 8139855119740a50ff639c83fbd22a4804743de8
</span>Author: Eric F <eric@iefdev.se>
AuthorDate: Sat Aug 29 19:27:19 2020 +0200
<span style='display:block; white-space:pre;color:#404040;'> gimp2{,-devel}: add patch to fix building on <= 10.7
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - add patch to fix building on <= 10.7
</span><span style='display:block; white-space:pre;color:#404040;'> - fix patches for (2) offsets
</span><span style='display:block; white-space:pre;color:#404040;'> - Closes: https://trac.macports.org/ticket/60508
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Since gimp2-devel, is an older version (2.10.19-*) I
</span><span style='display:block; white-space:pre;color:#404040;'> left out the other patches as is.
</span>---
graphics/gimp2-devel/Portfile | 1 +
graphics/gimp2-devel/files/patch-mach-task-info.diff | 16 ++++++++++++++++
graphics/gimp2/Portfile | 1 +
graphics/gimp2/files/MYPAINT_BRUSHES_DIR.patch | 12 ++++++------
graphics/gimp2/files/patch-etc-gimprc.in.diff | 4 ++--
graphics/gimp2/files/patch-mach-task-info.diff | 16 ++++++++++++++++
6 files changed, 42 insertions(+), 8 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 2a1f6285f0b..f8cadf8b163 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;'>@@ -96,6 +96,7 @@ compiler.cxx_standard 2014
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
patchfiles patch-etc-gimprc.in.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mach-task-info.diff \
</span> patch-quartz-32bit.diff \
MYPAINT_BRUSHES_DIR.patch
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b890e04048c
</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-mach-task-info.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpdashboard.c.orig 2020-08-29 17:02:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpdashboard.c 2020-08-29 17:55:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2398,6 +2398,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_MEMORY_GROUP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef PLATFORM_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define MACH_TASK_BASIC_INFO_COUNT TASK_BASIC_INFO_COUNT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define mach_task_basic_info_data_t task_basic_info_data_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define MACH_TASK_BASIC_INFO TASK_BASIC_INFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define mach_task_basic_info task_basic_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gimp_dashboard_sample_memory_used (GimpDashboard *dashboard,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Variable variable)
</span><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 646769e6c26..5894fdc9c0e 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;'>@@ -94,6 +94,7 @@ compiler.cxx_standard 2014
</span> compiler.blacklist-append *gcc-3.* *gcc-4.* {clang < 700}
patchfiles patch-etc-gimprc.in.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-mach-task-info.diff \
</span> patch-quartz-32bit.diff \
MYPAINT_BRUSHES_DIR.patch
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp2/files/MYPAINT_BRUSHES_DIR.patch b/graphics/gimp2/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/files/MYPAINT_BRUSHES_DIR.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp2/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/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 069f4fa38ef..5eab0417a24 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> --- etc/gimprc.in.orig 2020-02-16 07:04:57.000000000 -0800
+++ etc/gimprc.in 2020-02-22 17:04:36.000000000 -0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -821,11 +821,13 @@
</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/files/patch-mach-task-info.diff b/graphics/gimp2/files/patch-mach-task-info.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b890e04048c
</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/patch-mach-task-info.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,16 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- app/widgets/gimpdashboard.c.orig 2020-08-29 17:02:04.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ app/widgets/gimpdashboard.c 2020-08-29 17:55:26.000000000 +0200
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2398,6 +2398,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef HAVE_MEMORY_GROUP
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #ifdef PLATFORM_OSX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if MAC_OS_X_VERSION_MAX_ALLOWED < 1080
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define MACH_TASK_BASIC_INFO_COUNT TASK_BASIC_INFO_COUNT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define mach_task_basic_info_data_t task_basic_info_data_t
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define MACH_TASK_BASIC_INFO TASK_BASIC_INFO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #define mach_task_basic_info task_basic_info
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static void
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gimp_dashboard_sample_memory_used (GimpDashboard *dashboard,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Variable variable)
</span></pre><pre style='margin:0'>
</pre>