Update modulesets.

Author: auouymous

modulesets/gtk-osx-network.modules

@@ -274,7 +274,7 @@
        USE_WOFF2: Requires Woff2. No module for this
        USE_WPE_RENDERER: For embedded systems, not Macs. -->
   <cmake id="webkit2gtk3"
-         cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_MINIBROWSER=ON -DENABLE_INTROSPECTION=ON -DUSE_SYSTEMD=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF -DENABLE_TOUCH_EVENTS=OFF -DUSE_OPENJPEG=OFF -DUSE_WOFF2=OFF -DUSE_WPE_RENDERER=OFF -DENABLE_GRAPHICS_CONTEXT_GL=OFF -DENABLE_GAMEPAD=OFF -DUSE_APPLE_ICU=NO -DCMAKE_CXX_FLAGS="-stdlib=libc++  -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-deprecated-copy" -DCMAKE_MACOSX_RPATH=OFF -DCMAKE_INSTALL_NAME_DIR="${JHBUILD_PREFIX}/lib"'>
+         cmakeargs='-DPORT=GTK -DENABLE_X11_TARGET=OFF -DENABLE_QUARTZ_TARGET=ON -DENABLE_MINIBROWSER=ON -DENABLE_INTROSPECTION=ON -DUSE_SYSTEMD=OFF -DENABLE_VIDEO=OFF -DENABLE_WEB_AUDIO=OFF -DENABLE_GEOLOCATION=OFF -DUSE_LIBNOTIFY=OFF -DUSE_LIBHYPHEN=OFF -DUSE_LIBSECRET=OFF -DENABLE_TOUCH_EVENTS=OFF -DUSE_OPENJPEG=OFF -DUSE_WOFF2=OFF -DUSE_WPE_RENDERER=OFF -DENABLE_GRAPHICS_CONTEXT_GL=OFF -DENABLE_GAMEPAD=OFF -DUSE_APPLE_ICU=NO -DCMAKE_CXX_FLAGS="-stdlib=libc++  -Wno-deprecated-declarations -Wno-unused-but-set-variable -Wno-deprecated-copy -Wno-missing-template-arg-list-after-template-kw" -DCMAKE_MACOSX_RPATH=OFF -DCMAKE_INSTALL_NAME_DIR="${JHBUILD_PREFIX}/lib"'>
     <branch module="webkitgtk-2.32.0.tar.xz"
             version="2.32.0"
             hash="sha256:9d7df4dae9ada2394257565acc2a68ace9308c4c61c3fcc00111dc1f11076bf0"

modulesets/gtk-osx.modules

@@ -282,8 +282,7 @@
             version="3.24.48"
             hash="sha256:d10ce9ea9df44c1016d8d1721f39e55d3d607fcfb85334aec0d236cdc9a70556">
       <patch file="gtk-3.24.48-check-all-dnd-windows.patch" strip="1" />
-      <!-- This patch causes issues with resizing windows. Maybe they're not so redundant.
-          patch file="gtk-3.24.48-remove-redundant-NSView-calls.patch" strip="1" / -->
+      <patch file="gtk-3.24.48-fix-context-menus-non-Retina.patch" strip="1" />
       <patch file="gtk-3.24.48-fix-leaking-cairo-surface.patch" strip="1" />
       <patch file="gtk-3.24.48-GtkNotebook-drag-operation-failed.patch" strip="1" />
     </branch>

modulesets/patches/gtk-3.24.48-fix-context-menus-non-Retina.patch

@@ -0,0 +1,34 @@
+From ae49ae3f657dc0086eca8873213cf9dcee953ab8 Mon Sep 17 00:00:00 2001
+From: John Ralls <[email protected]>
+Date: Thu, 12 Jun 2025 16:06:02 -0700
+Subject: [PATCH] [Quartz] Set the view's frame in a move for temp windows.
+
+Temp windows (context menus mostly) are created at 0,0 then moved to the
+pointer location. When the move is from a Retina to a non-Retina monitor
+the view needs to be redrawn at the new scale, but macOS doesn't recognize
+that and the menu ends up truncated. Setting the frame on the view forces
+the redraw.
+
+Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/7598
+---
+ gdk/quartz/gdkwindow-quartz.c | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/gdk/quartz/gdkwindow-quartz.c b/gdk/quartz/gdkwindow-quartz.c
+index 9a6aea9c6f..08e47dd089 100644
+--- a/gdk/quartz/gdkwindow-quartz.c
++++ b/gdk/quartz/gdkwindow-quartz.c
+@@ -1393,6 +1393,10 @@ move_resize_window_internal (GdkWindow *window,
+ 
+       frame_rect = [impl->toplevel frameRectForContentRect:content_rect];
+       [impl->toplevel setFrame:frame_rect display:YES];
++
++      if (window->window_type == GDK_WINDOW_TEMP)
++        [impl->view setFrame:content_rect];
++
+       impl->cairo_surface = gdk_quartz_ref_cairo_surface (window);
+       cairo_surface_destroy (impl->cairo_surface); // Remove the extra reference
+     }
+-- 
+2.39.5 (Apple Git-154)
+

modulesets/upstream-ref

@@ -1,7 +1,5 @@
-commit 881d9778f91ebae028feb01a42571330fd88d2fc
+commit 60b034689933384a3b6d6a45560b64a43f442f6e
 Author: John Ralls <[email protected]>
-Date:   Tue May 13 09:17:34 2025 -0700
+Date:   Thu Jun 12 16:39:45 2025 -0700
 
-    Disable new gdk-pixbuf dependency glycin.
-    
-    According to glycin's README.md it is Linux-only.
+    New error suppression flags for webkit on SDK15.5.

pins.sh

@@ -1,6 +1,6 @@
 # https://gitlab.gnome.org/GNOME/gtk-osx/-/commits/master
-# use latest commit (2025-05-13)
-PIN_GTK_OSX_COMMIT='881d9778'
+# use latest commit (2025-06-12)
+PIN_GTK_OSX_COMMIT='60b03468'
 
 # https://gitlab.gnome.org/GNOME/gtk-mac-bundler/-/commits/master
 # use latest commit (2025-03-20)