<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/2c81ccb63b274b8db0469211b1cb8b243251ae64">https://github.com/macports/macports-ports/commit/2c81ccb63b274b8db0469211b1cb8b243251ae64</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 2c81ccb63b2 gtk4: update to 4.14.2; switch to py 3.12
</span>2c81ccb63b2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 2c81ccb63b274b8db0469211b1cb8b243251ae64
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Sat Apr 13 14:57:20 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> gtk4: update to 4.14.2; switch to py 3.12
</span>---
gnome/gtk4/Portfile | 26 +++++-------
gnome/gtk4/files/patch-docs-rst2man.diff | 2 +-
gnome/gtk4/files/patch-epoxy-opengl.diff | 40 ------------------
.../gtk4/files/patch-quartz-nspasteboardtype.diff | 47 ----------------------
4 files changed, 11 insertions(+), 104 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/Portfile b/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ddfad293d5..4d51bb86c4f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk4/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -15,7 +15,7 @@ set my_name gtk4
</span> # GNOME project name
set gname gtk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 4.12.3
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 4.14.2
</span> revision 0
categories gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,14 +35,14 @@ distname ${gname}-${version}
</span> dist_subdir ${my_name}
use_xz yes
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2257a3d23d7b9eef9b8d62b03ff4f5106e94ba7b \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 148ce262f6c86487455fb1d9793c3f58bc3e1da477a29617fadb0420f5870a89 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 16930224
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 5802813007b532e1498fcdd10a383ba815ecfd6d \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 22604cef2898a79e5f2143bb7aee2b7d1fa2eb946989a9d1338ecf9c8ae0e072 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 18331244
</span>
# Disable unexpected download of subprojects
meson.wrap_mode nodownload
<span style='display:block; white-space:pre;background:#ffe0e0;'>-set python_branch 3.11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set python_branch 3.12
</span> set python_version [string map {. {}} ${python_branch}]
set port_ver_major [lindex [split ${version} .] 0]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,14 +53,6 @@ patchfiles-append patch-docs-rst2man.diff
</span> # See: https://trac.macports.org/ticket/67985
patchfiles-append patch-meson-build-debug.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Fix builds for 10.12 and earlier, due to use of NSPasteboardType.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5813
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-quartz-nspasteboardtype.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream patch to fix conflicting declarations between libepoxy/OpenGL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-epoxy-opengl.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-patch {
reinplace "s|@@PYTHON_VERSION@@|${python_branch}|" \
docs/reference/gtk/meson.build
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -68,19 +60,21 @@ post-patch {
</span> # build assumes python3 exists
reinplace "s|^#!/usr/bin/env python3|#!${prefix}/bin/python${python_branch}|" \
build-aux/meson/dist-data.py \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- build-aux/meson/gen-demo-header.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build-aux/meson/gen-profile-conf.py \
</span> build-aux/meson/gen-visibility-macros.py \
demos/gtk-demo/geninclude.py \
gdk/broadway/gen-c-array.py \
gdk/gen-gdk-gresources-xml.py \
gsk/gen-gsk-gresources-xml.py \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsk/gpu/shaders/generate-header.py \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gsk/gpu/shaders/process-glsl-includes.py \
</span> gtk/gen-gtk-gresources-xml.py \
gtk/gentypefuncs.py \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ testsuite/introspection/api.py \
</span> tools/generate-uac-manifest.py
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # these two are slightly different
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # these are slightly different
</span> reinplace "s|python3|${prefix}/bin/python${python_branch}|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- testsuite/introspection/api.py \
</span> examples/squares.py
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/files/patch-docs-rst2man.diff b/gnome/gtk4/files/patch-docs-rst2man.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 83ca0406314..90774a00237 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4/files/patch-docs-rst2man.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk4/files/patch-docs-rst2man.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,7 +5,7 @@
</span> endif
-rst2man = find_program('rst2man', 'rst2man.py', required: false)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+rst2man = find_program('rst2man', 'rst2man-@@PYTHON_VERSION@@.py', required: false)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++rst2man = find_program('rst2man', 'rst2man-@@PYTHON_VERSION@@', required: false)
</span> if get_option('man-pages') and not rst2man.found()
error('No rst2man found, but man pages were explicitly enabled')
endif
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/files/patch-epoxy-opengl.diff b/gnome/gtk4/files/patch-epoxy-opengl.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index a19ed2b4122..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4/files/patch-epoxy-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,40 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Upstream patch, which fixes compilation issues due to conflicting OpenGL-related headers.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208
</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/macos/gdkmacosglcontext-private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/macos/gdkmacosglcontext-private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,9 +27,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gdkmacosdisplay.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gdkmacossurface.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <OpenGL/gl3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#import <AppKit/AppKit.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#import <epoxy/gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/macos/gdkmacosglcontext.c b/gdk/macos/gdkmacosglcontext.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 87e6e19fe0a..a706a407b5d 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/macos/gdkmacosglcontext.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/macos/gdkmacosglcontext.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,7 +21,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "gdkconfig.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#include <OpenGL/gl3.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <OpenGL/CGLIOSurface.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <QuartzCore/QuartzCore.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -499,7 +498,7 @@ gdk_macos_gl_context_begin_frame (GdkDrawContext *context,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_gl_context_make_current (GDK_GL_CONTEXT (self));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_macos_gl_context_allocate (self);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- GDK_DRAW_CONTEXT_CLASS (gdk_macos_gl_context_parent_class)->begin_frame (context, prefers_high_depth, region);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ GDK_DRAW_CONTEXT_CLASS (gdk_macos_gl_context_parent_class)->begin_frame (context, depth, region);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_gl_context_make_current (GDK_GL_CONTEXT (self));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHECK_GL (NULL, glBindFramebuffer (GL_FRAMEBUFFER, self->fbo));
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gtk4/files/patch-quartz-nspasteboardtype.diff b/gnome/gtk4/files/patch-quartz-nspasteboardtype.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9ffc695c866..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gtk4/files/patch-quartz-nspasteboardtype.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,47 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# gdk/macos: fix builds on macOS before 10.13
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5813
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#==================================================================================================
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/macos/gdkmacosclipboard-private.h b/gdk/macos/gdkmacosclipboard-private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 5679b13a36fdaf394e10e292beefcc548c9495cc..4866cf22e006ec07c9d81f6aeeab661d92a5ecc9 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/macos/gdkmacosclipboard-private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/macos/gdkmacosclipboard-private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -27,10 +27,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#ifndef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--typedef NSString *NSPasteboardType;
</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;'>- #define GDK_TYPE_MACOS_CLIPBOARD (_gdk_macos_clipboard_get_type())
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_DECLARE_FINAL_TYPE (GdkMacosClipboard, _gdk_macos_clipboard, GDK, MACOS_CLIPBOARD, GdkClipboard)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/macos/gdkmacospasteboard-private.h b/gdk/macos/gdkmacospasteboard-private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index cac18a8fde5fa5a074258c9b1a46002778e71ea4..cc7f6b8e475c2f97500708e574e044f1aee1f07e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/macos/gdkmacospasteboard-private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/macos/gdkmacospasteboard-private.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,6 +26,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- G_BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifndef AVAILABLE_MAC_OS_X_VERSION_10_13_AND_LATER
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+typedef NSString *NSPasteboardType;
</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;'>- @interface GdkMacosPasteboardItemDataProvider : NSObject <NSPasteboardItemDataProvider>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GdkContentProvider *_contentProvider;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/gdk/macos/gdkmacospasteboard.c b/gdk/macos/gdkmacospasteboard.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 0903c5352accda899092addb241feb4c19de8b77..b26248a9548f3438ae8aff20b72b1ae3e32fe514 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gdk/macos/gdkmacospasteboard.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gdk/macos/gdkmacospasteboard.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -400,7 +400,7 @@ _gdk_macos_pasteboard_register_drag_types (NSWindow *window)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_content_formats_get_gtypes (formats, &n_gtypes);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (n_gtypes)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- [ret addObject:NSPasteboardTypeURL];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ [ret addObject:PTYPE(URL)];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gdk_content_formats_unref (formats);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span></pre><pre style='margin:0'>
</pre>