<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/94068da840edd699797442ec1cffd6ecfdb7b08c">https://github.com/macports/macports-ports/commit/94068da840edd699797442ec1cffd6ecfdb7b08c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 94068da840edd699797442ec1cffd6ecfdb7b08c
</span>Author: Christopher Nielsen <mascguy@github.com>
AuthorDate: Fri Aug 18 11:33:28 2023 -0400

<span style='display:block; white-space:pre;color:#404040;'>    gtk4: update to 4.12.0; add lib dep librsvg
</span>---
 gnome/gtk4/Portfile                      | 13 +++++++----
 gnome/gtk4/files/patch-epoxy-opengl.diff | 40 ++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 4 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 77ec09cd2f8..20b7feae48a 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.10.4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version             4.12.0
</span> revision            0
 
 categories          gnome
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,9 @@ distname            ${gname}-${version}
</span> dist_subdir         ${my_name}
 use_xz              yes
 
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums           rmd160  6b15945742e4aabd1f998062c146f1e8e665e3ea \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    sha256  7725400482e0685e28265e226c62847f4e73cfca9e9b416ac5838207f5377a24 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-                    size    20526652
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums           rmd160  8078132e8d9f30130c9c92a3249e1649d2fecdee \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    sha256  a6d10829f405b1afc0b65e2a9642c04126a1d1b638d11c6d97426da4f84f1f6f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    size    16918992
</span> 
 set python_branch   3.11
 set python_version  [string map {. {}} ${python_branch}]
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -52,6 +52,10 @@ patchfiles-append   patch-meson-dont-werror-on-missing-declarations.diff
</span> 
 patchfiles-append   patch-quartz-nspasteboardtype.diff
 
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream patch to fix conflicting declarations between libepoxy/OpenGL
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   patch-epoxy-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> post-patch {
     reinplace "s|@@PYTHON_VERSION@@|${python_branch}|" \
         docs/reference/gtk/meson.build  \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -97,6 +101,7 @@ depends_lib-append \
</span>                     port:libepoxy \
                     path:include/turbojpeg.h:libjpeg-turbo \
                     port:libpng \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+                    path:lib/pkgconfig/librsvg-2.0.pc:librsvg \
</span>                     port:mesa \
                     path:lib/pkgconfig/pango.pc:pango \
                     port:tiff
<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>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a19ed2b4122
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gtk4/files/patch-epoxy-opengl.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,40 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#==================================================================================================
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Upstream patch, which fixes compilation issues due to conflicting OpenGL-related headers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/6208
</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/macos/gdkmacosglcontext-private.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdk/macos/gdkmacosglcontext-private.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -27,9 +27,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gdkmacosdisplay.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gdkmacossurface.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <OpenGL/OpenGL.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <OpenGL/gl3.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#import <AppKit/AppKit.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#import <epoxy/gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ G_BEGIN_DECLS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/gdk/macos/gdkmacosglcontext.c b/gdk/macos/gdkmacosglcontext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 87e6e19fe0a..a706a407b5d 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gdk/macos/gdkmacosglcontext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gdk/macos/gdkmacosglcontext.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include "gdkconfig.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <OpenGL/gl3.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <OpenGL/CGLIOSurface.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <QuartzCore/QuartzCore.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -499,7 +498,7 @@ gdk_macos_gl_context_begin_frame (GdkDrawContext *context,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   gdk_gl_context_make_current (GDK_GL_CONTEXT (self));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   gdk_macos_gl_context_allocate (self);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-  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:#e0ffe0;'>++  GDK_DRAW_CONTEXT_CLASS (gdk_macos_gl_context_parent_class)->begin_frame (context, depth, region);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   gdk_gl_context_make_current (GDK_GL_CONTEXT (self));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+   CHECK_GL (NULL, glBindFramebuffer (GL_FRAMEBUFFER, self->fbo));
</span></pre><pre style='margin:0'>

</pre>