<pre style='margin:0'>
Christopher Nielsen (mascguy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/b70889b6055775b4d631e04984c3c54c17daa6a9">https://github.com/macports/macports-ports/commit/b70889b6055775b4d631e04984c3c54c17daa6a9</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit b70889b6055775b4d631e04984c3c54c17daa6a9
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Oct 26 14:47:41 2021 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk2-devel: add minimal patch for 10.11 and earlier, to fix gimp2 build
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/63676
</span>---
gnome/gtk2-devel/Portfile | 7 +++++--
gnome/gtk2-devel/files/patch-gdkquartz-osx-versions.diff | 15 +++++++++++++++
...atch => patch-gimp-issue-5989-bigsur-perf-gtk-p1.diff} | 14 --------------
...atch => patch-gimp-issue-5989-bigsur-perf-gtk-p2.diff} | 0
4 files changed, 20 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2-devel/Portfile b/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2a0b4d6a084..0b6b9a13968 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -230,11 +230,14 @@ variant quartz conflicts x11 {
</span>
configure.args-append --with-gdktarget=quartz
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ # This upstream patch is necessary for all versions
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gdkquartz-osx-versions.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # These upstream patches require macOS 10.12 and later.
if {${os.major} >= 16} {
# https://gitlab.gnome.org/GNOME/gimp/-/issues/5989 and https://trac.macports.org/ticket/59481
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append gimp_issue_5989_bigsur_performance_gtk.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gimp_issue_5989_bigsur_performance_gtk_2.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles-append patch-gimp-issue-5989-bigsur-perf-gtk-p1.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-gimp-issue-5989-bigsur-perf-gtk-p2.diff
</span> }
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2-devel/files/patch-gdkquartz-osx-versions.diff b/gnome/gtk2-devel/files/patch-gdkquartz-osx-versions.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7c8e62b7c55
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2-devel/files/patch-gdkquartz-osx-versions.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,15 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -Naur a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdk/quartz/gdkquartz.h 2021-01-11 20:51:03.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdk/quartz/gdkquartz.h 2021-01-11 20:42:40.000000000 +0000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -54,7 +54,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDK_OSX_SIERRA = 12,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDK_OSX_HIGH_SIERRA = 13,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDK_OSX_MOJAVE = 14,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GDK_OSX_CURRENT = 14,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GDK_OSX_CATALINA = 15,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GDK_OSX_BIG_SUR = 16,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GDK_OSX_CURRENT = 16,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDK_OSX_NEW = 99
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } GdkOSXVersion;
</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/gnome/gtk2-devel/files/gimp_issue_5989_bigsur_performance_gtk.patch b/gnome/gtk2-devel/files/patch-gimp-issue-5989-bigsur-perf-gtk-p1.diff
</span>similarity index 86%
rename from gnome/gtk2-devel/files/gimp_issue_5989_bigsur_performance_gtk.patch
rename to gnome/gtk2-devel/files/patch-gimp-issue-5989-bigsur-perf-gtk-p1.diff
<span style='display:block; white-space:pre;color:#808080;'>index c10a9b04c2c..3dc9ead9122 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk2-devel/files/gimp_issue_5989_bigsur_performance_gtk.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk2-devel/files/patch-gimp-issue-5989-bigsur-perf-gtk-p1.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -44,20 +44,6 @@ diff -Naur a/gdk/quartz/gdkdrawable-quartz.c b/gdk/quartz/gdkdrawable-quartz.c
</span> }
}
else if (GDK_IS_PIXMAP_IMPL_QUARTZ (drawable))
<span style='display:block; white-space:pre;background:#ffe0e0;'>-diff -Naur a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/quartz/gdkquartz.h 2021-01-11 20:51:03.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/quartz/gdkquartz.h 2021-01-11 20:42:40.000000000 +0000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -54,7 +54,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GDK_OSX_SIERRA = 12,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GDK_OSX_HIGH_SIERRA = 13,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GDK_OSX_MOJAVE = 14,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GDK_OSX_CURRENT = 14,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDK_OSX_CATALINA = 15,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDK_OSX_BIG_SUR = 16,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDK_OSX_CURRENT = 16,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GDK_OSX_NEW = 99
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } GdkOSXVersion;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> diff -Naur a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
--- gdk/quartz/gdkwindow-quartz.c 2021-01-11 20:51:03.000000000 +0000
+++ gdk/quartz/gdkwindow-quartz.c 2021-01-11 20:42:40.000000000 +0000
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk2-devel/files/gimp_issue_5989_bigsur_performance_gtk_2.patch b/gnome/gtk2-devel/files/patch-gimp-issue-5989-bigsur-perf-gtk-p2.diff
</span>similarity index 100%
rename from gnome/gtk2-devel/files/gimp_issue_5989_bigsur_performance_gtk_2.patch
rename to gnome/gtk2-devel/files/patch-gimp-issue-5989-bigsur-perf-gtk-p2.diff
</pre><pre style='margin:0'>
</pre>