<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f64c3fbfe3cec7315461ffe2a15229738a5f6872">https://github.com/macports/macports-ports/commit/f64c3fbfe3cec7315461ffe2a15229738a5f6872</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 f64c3fbfe3c gtk3: add forgotten patchfile
</span>f64c3fbfe3c is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f64c3fbfe3cec7315461ffe2a15229738a5f6872
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Nov 16 11:15:29 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> gtk3: add forgotten patchfile
</span>---
gnome/gtk3/files/patch-gdk_quartz-12_compat.diff | 99 ++++++++++++++++++++++++
1 file changed, 99 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3/files/patch-gdk_quartz-12_compat.diff b/gnome/gtk3/files/patch-gdk_quartz-12_compat.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7d83b53447a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3/files/patch-gdk_quartz-12_compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,99 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 36315cbe2b3c9d1c1b7508d9494a251eddbc4452 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: John Ralls <jralls@ceridwen.us>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Thu, 14 Oct 2021 12:41:05 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] [quartz]Use the absolute value of Scale values for
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGContextScaleSCM
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+In macOS-12.sdk CGContextConverSizeToDeviceSpace returns a negative
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+height and passing that to CGContextScaleCTM in turn causes the cairo
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+surface to draw outside the window where it can't be seen. Passing the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+absolute values of the scale factors fixes the display on macOS 12 without
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+affecting earlier macOS versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdk/quartz/gdkwindow-quartz.c | 3 +--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 1a3389bb32..a5c5c31945 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -183,8 +183,7 @@ gdk_window_impl_quartz_get_context (GdkWindowImplQuartz *window_impl,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * in gdk_quartz_ref_cairo_surface () */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ scale = CGContextConvertSizeToDeviceSpace (cg_context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CGSizeMake (1.0, 1.0));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- CGContextScaleCTM (cg_context, 1.0 / scale.width, 1.0 / scale.height);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ CGContextScaleCTM (cg_context, 1.0 / fabs(scale.width), 1.0 / fabs(scale.height));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return cg_context;
</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;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From a752e338381bc37dbe8d4c04ec23e4f6fd911b30 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: John Ralls <jralls@ceridwen.us>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 8 Sep 2021 18:01:50 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Update Quartz version detection for macOS 12.
</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;'>+ gdk/quartz/gdkglobals-quartz.c | 16 +++++++---------
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdk/quartz/gdkquartz.h | 3 ++-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 2 files changed, 9 insertions(+), 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdk/quartz/gdkglobals-quartz.c b/gdk/quartz/gdkglobals-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 72aed1c92d..30649efe8a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdk/quartz/gdkglobals-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdk/quartz/gdkglobals-quartz.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -29,28 +29,26 @@ GdkWindow *_gdk_root = NULL;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GdkOSXVersion
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gdk_quartz_osx_version (void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- static gint32 minor = GDK_OSX_UNSUPPORTED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ static gint32 vkey = GDK_OSX_UNSUPPORTED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (minor == GDK_OSX_UNSUPPORTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (vkey == GDK_OSX_UNSUPPORTED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&minor);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&vkey);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ g_return_val_if_fail (err == noErr, GDK_OSX_UNSUPPORTED);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ NSOperatingSystemVersion version;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version = [[NSProcessInfo processInfo] operatingSystemVersion];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- minor = version.minorVersion;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (version.majorVersion == 11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- minor += 16;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ vkey = version.majorVersion == 10 ? version.minorVersion : version.majorVersion + 5;
</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;'>+- if (minor < GDK_OSX_MIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (vkey < GDK_OSX_MIN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return GDK_OSX_UNSUPPORTED;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else if (minor > GDK_OSX_CURRENT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else if (vkey > GDK_OSX_CURRENT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return GDK_OSX_NEW;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return minor;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return vkey;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index dd1b4f41af..2d53dcbce6 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdk/quartz/gdkquartz.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdk/quartz/gdkquartz.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -42,7 +42,8 @@ typedef enum
</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_CATALINA = 15,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GDK_OSX_BIGSUR = 16,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- GDK_OSX_CURRENT = 15,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GDK_OSX_MONTEREY = 17,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ GDK_OSX_CURRENT = 17,
</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;background:#e0ffe0;'>+GitLab
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>