<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/9fc919f6e1b7e89897e8b999933ddb15aabe6051">https://github.com/macports/macports-ports/commit/9fc919f6e1b7e89897e8b999933ddb15aabe6051</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 9fc919f6e1b gtk3: update to 3.24.31 - Also remove obsolete patches; now included in upstream
</span>9fc919f6e1b is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 9fc919f6e1b7e89897e8b999933ddb15aabe6051
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Tue Dec 28 11:16:02 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> gtk3: update to 3.24.31
</span><span style='display:block; white-space:pre;color:#404040;'> - Also remove obsolete patches; now included in upstream
</span>---
gnome/gtk3/Portfile | 11 +--
gnome/gtk3/files/patch-gdk_quartz-12_compat.diff | 99 ------------------------
2 files changed, 4 insertions(+), 106 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk3/Portfile b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 9bbca3ba50d..a221177ae17 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk3/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -10,7 +10,7 @@ PortGroup legacysupport 1.1
</span> name gtk3
conflicts gtk3-devel
set my_name gtk3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.24.30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.24.31
</span> revision 0
epoch 1
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +34,9 @@ dist_subdir ${my_name}
</span> use_xz yes
master_sites gnome:sources/${proj_name}/${branch}/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 fed62b16b1a0b533ff42df78a34394f1b68af212 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 ba75bfff320ad1f4cfbee92ba813ec336322cc3c660d406aad014b07087a3ba9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 22407016
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 57ba456a23b71d19d91bf8a70c0f02cdc7e72360 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 423c3e7fdb4c459ee889e35fd4d71fd2623562541c1041b11c07e5ad1ff10bf9 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 22449112
</span>
minimum_xcodeversions {9 3.1}
<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;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>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/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></pre><pre style='margin:0'>
</pre>