<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/1a420aeae3543154e9dd67eb19fe45a4967a0997">https://github.com/macports/macports-ports/commit/1a420aeae3543154e9dd67eb19fe45a4967a0997</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 1a420aeae35 gtk3-devel: remove obsolete patches - Fixes included in upstream release 3.24.31
</span>1a420aeae35 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 1a420aeae3543154e9dd67eb19fe45a4967a0997
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Mon Dec 27 14:28:59 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> gtk3-devel: remove obsolete patches
</span><span style='display:block; white-space:pre;color:#404040;'> - Fixes included in upstream release 3.24.31
</span>---
gnome/gtk3-devel/Portfile | 5 --
.../files/patch-gdk_quartz-12_compat.diff | 99 ----------------------
.../files/patch-gdkwindow-quartz-performance.diff | 90 --------------------
3 files changed, 194 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3-devel/Portfile b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 52615fdc2bb..89fd6a97b40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -163,9 +163,6 @@ platform darwin {
</span> # requires cups 1.7
configure.args-append --disable-cups
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${os.major} >= 21} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gdk_quartz-12_compat.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> }
if {${universal_possible} && [variant_isset universal]} {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -247,8 +244,6 @@ variant quartz conflicts x11 {
</span> require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
require_active_variants path:lib/pkgconfig/pango.pc:pango quartz
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles-append patch-gdkwindow-quartz-performance.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-append --enable-quartz-backend
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3-devel/files/patch-gdk_quartz-12_compat.diff b/gnome/gtk3-devel/files/patch-gdk_quartz-12_compat.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 7d83b53447a..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3-devel/files/patch-gdk_quartz-12_compat.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,99 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 36315cbe2b3c9d1c1b7508d9494a251eddbc4452 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: John Ralls <jralls@ceridwen.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Thu, 14 Oct 2021 12:41:05 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] [quartz]Use the absolute value of Scale values for
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGContextScaleSCM
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-In macOS-12.sdk CGContextConverSizeToDeviceSpace returns a negative
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-height and passing that to CGContextScaleCTM in turn causes the cairo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-surface to draw outside the window where it can't be seen. Passing the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-absolute values of the scale factors fixes the display on macOS 12 without
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-affecting earlier macOS versions.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk/quartz/gdkwindow-quartz.c | 3 +--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1a3389bb32..a5c5c31945 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -183,8 +183,7 @@ gdk_window_impl_quartz_get_context (GdkWindowImplQuartz *window_impl,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * in gdk_quartz_ref_cairo_surface () */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- scale = CGContextConvertSizeToDeviceSpace (cg_context,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CGSizeMake (1.0, 1.0));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGContextScaleCTM (cg_context, 1.0 / scale.width, 1.0 / scale.height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGContextScaleCTM (cg_context, 1.0 / fabs(scale.width), 1.0 / fabs(scale.height));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return cg_context;
</span><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:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From a752e338381bc37dbe8d4c04ec23e4f6fd911b30 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: John Ralls <jralls@ceridwen.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Wed, 8 Sep 2021 18:01:50 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Update Quartz version detection for macOS 12.
</span><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:#ffe0e0;'>- gdk/quartz/gdkglobals-quartz.c | 16 +++++++---------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk/quartz/gdkquartz.h | 3 ++-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 9 insertions(+), 10 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/quartz/gdkglobals-quartz.c b/gdk/quartz/gdkglobals-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 72aed1c92d..30649efe8a 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/quartz/gdkglobals-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/quartz/gdkglobals-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -29,28 +29,26 @@ GdkWindow *_gdk_root = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GdkOSXVersion
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_quartz_osx_version (void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- static gint32 minor = GDK_OSX_UNSUPPORTED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ static gint32 vkey = GDK_OSX_UNSUPPORTED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (minor == GDK_OSX_UNSUPPORTED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (vkey == GDK_OSX_UNSUPPORTED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if MAC_OS_X_VERSION_MIN_REQUIRED < 101000
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&minor);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ OSErr err = Gestalt (gestaltSystemVersionMinor, (SInt32*)&vkey);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- g_return_val_if_fail (err == noErr, GDK_OSX_UNSUPPORTED);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NSOperatingSystemVersion version;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- version = [[NSProcessInfo processInfo] operatingSystemVersion];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- minor = version.minorVersion;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (version.majorVersion == 11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- minor += 16;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ vkey = version.majorVersion == 10 ? version.minorVersion : version.majorVersion + 5;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><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:#ffe0e0;'>-- if (minor < GDK_OSX_MIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (vkey < GDK_OSX_MIN)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return GDK_OSX_UNSUPPORTED;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- else if (minor > GDK_OSX_CURRENT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else if (vkey > GDK_OSX_CURRENT)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return GDK_OSX_NEW;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return minor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return vkey;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index dd1b4f41af..2d53dcbce6 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/quartz/gdkquartz.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/quartz/gdkquartz.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -42,7 +42,8 @@ typedef enum
</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_CATALINA = 15,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GDK_OSX_BIGSUR = 16,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GDK_OSX_CURRENT = 15,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDK_OSX_MONTEREY = 17,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDK_OSX_CURRENT = 17,
</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><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3-devel/files/patch-gdkwindow-quartz-performance.diff b/gnome/gtk3-devel/files/patch-gdkwindow-quartz-performance.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b048c87933c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3-devel/files/patch-gdkwindow-quartz-performance.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,90 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 243672d3e226af8f901353004cb8d063c8c3f21a Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: John Ralls <jralls@ceridwen.us>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sun, 17 Oct 2021 14:53:11 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Use cairo_image_surfaces for most drawing.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Paint to the window's CGContextRef surface only in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-gdk_window_end_paint_internal.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/3714
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk/quartz/gdkwindow-quartz.c | 20 ++++++++++++++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk/quartz/gdkwindow-quartz.h | 2 ++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 18 insertions(+), 4 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index a5c5c31945..a1ab1e2f6d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/quartz/gdkwindow-quartz.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -296,11 +296,12 @@ gdk_quartz_create_cairo_surface (GdkWindowImplQuartz *impl,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int width,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int height)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- CGContextRef cg_context;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ CGContextRef cg_context = NULL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GdkQuartzCairoSurfaceData *surface_data;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_surface_t *surface;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cg_context = gdk_quartz_window_get_context (impl, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (impl->use_cg_context)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cg_context = gdk_quartz_window_get_context (impl, TRUE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- surface_data = g_new (GdkQuartzCairoSurfaceData, 1);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- surface_data->window_impl = impl;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -310,7 +311,7 @@ gdk_quartz_create_cairo_surface (GdkWindowImplQuartz *impl,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- surface = cairo_quartz_surface_create_for_cg_context (cg_context,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- width, height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- surface = cairo_quartz_surface_create(CAIRO_FORMAT_ARGB32, width, height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ surface = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, width, height);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cairo_surface_set_user_data (surface, &gdk_quartz_cairo_key,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- surface_data,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -348,12 +349,22 @@ static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_window_impl_quartz_init (GdkWindowImplQuartz *impl)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- impl->type_hint = GDK_WINDOW_TYPE_HINT_NORMAL;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ impl->use_cg_context = FALSE;
</span><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:#ffe0e0;'>- static gboolean
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_window_impl_quartz_begin_paint (GdkWindow *window)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ impl->use_cg_context = FALSE;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return TRUE;
</span><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:#ffe0e0;'>-+static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+gdk_window_impl_quartz_end_paint (GdkWindow *window)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GdkWindowImplQuartz *impl = GDK_WINDOW_IMPL_QUARTZ (window->impl);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ impl->use_cg_context = TRUE;
</span><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:#ffe0e0;'>- static void
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -3084,6 +3095,7 @@ gdk_window_impl_quartz_class_init (GdkWindowImplQuartzClass *klass)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- impl_class->get_shape = gdk_quartz_window_get_shape;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- impl_class->get_input_shape = gdk_quartz_window_get_input_shape;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- impl_class->begin_paint = gdk_window_impl_quartz_begin_paint;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ impl_class->end_paint = gdk_window_impl_quartz_end_paint;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- impl_class->get_scale_factor = gdk_quartz_window_get_scale_factor;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- impl_class->focus = gdk_quartz_window_focus;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/quartz/gdkwindow-quartz.h b/gdk/quartz/gdkwindow-quartz.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 1175f072e4..c085d5cc59 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/quartz/gdkwindow-quartz.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/quartz/gdkwindow-quartz.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -64,6 +64,8 @@ struct _GdkWindowImplQuartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint shadow_top;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gint shadow_max;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ gboolean use_cg_context;
</span><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:#ffe0e0;'>- struct _GdkWindowImplQuartzClass
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-GitLab
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>