<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d76f98202593a1121fa144d6faa3326b002250af">https://github.com/macports/macports-ports/commit/d76f98202593a1121fa144d6faa3326b002250af</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 d76f9820259 wine-devel,wine-staging: Update to 10.6
</span>d76f9820259 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d76f98202593a1121fa144d6faa3326b002250af
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Wed Apr 23 17:45:38 2025 -0400
<span style='display:block; white-space:pre;color:#404040;'> wine-devel,wine-staging: Update to 10.6
</span>---
emulators/wine-devel/Portfile | 25 +++++++-----
emulators/wine-devel/files/0002-macos_hacks.diff | 32 +++++++++++----
.../0004-winemac.drv-export-essential-apis.diff | 46 ++++++++++++++++++++++
3 files changed, 87 insertions(+), 16 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-devel/Portfile b/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 928abd2547f..c945f40944b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup muniversal 1.1
</span>
# Keep the wine-stable, wine-devel and wine-crossover portfiles as similar as possible.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup wine-mirror wine 10.5 wine-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup wine-mirror wine 10.6 wine-
</span> github.tarball_from archive
name wine-devel
conflicts wine-stable wine-staging wine-crossover
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -38,9 +38,9 @@ long_description \
</span>
checksums \
${distname}${extract.suffix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 6e72d42b7ba38e40b3b3cd1f084c27ee8bb81730 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 07d10cff59aa5433d4a42e310b03250e7f107b044a411b3c73fa707f34ee8f4c \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 52547721
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 369c753d2efdf544923eda4720e9c4b0427b03e4 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 63fb2e7a14c7ff77a56a34d9e1b9013d3c9ecb0e1d7899695f11e95850df632f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 52587887
</span>
depends_build \
port:bison \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -58,7 +58,7 @@ depends_lib \
</span>
depends_run \
port:mingw-w64-wine-gecko-2.47.4 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:mingw-w64-wine-mono-9.4.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:mingw-w64-wine-mono-10.0.0
</span>
post-extract {
# https://gitlab.winehq.org/wine/wine/-/commit/c7a97b5d5d56ef00a0061b75412c6e0e489fdc99
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -76,6 +76,10 @@ patchfiles-append \
</span> patchfiles-append \
0002-macos_hacks.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Required for DXMT
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0004-winemac.drv-export-essential-apis.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # wine requires the program specified in INSTALL to create intermediate
# directories; /usr/bin/install doesn't.
# http://bugs.winehq.org/show_bug.cgi?id=35310
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -86,7 +90,6 @@ configure.args.x86_64 \
</span> --enable-win64
configure.args \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-tests \
</span> --without-alsa \
--without-capi \
--with-coreaudio \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -122,6 +125,10 @@ configure.args \
</span> --without-wayland \
--without-x
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-tests \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --disable-winebth_sys
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.env-append ac_cv_lib_soname_vulkan=
# We need to tell the linker to add MacPorts to the rpath stack.
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -146,9 +153,9 @@ subport wine-staging {
</span>
checksums-append \
${wine_staging_distfile} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 33eac6ce4f898982e77d6e29f62680d0fc6d86cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 6b58e23d9a7e77ee8f4097105f29135f222421d5560c13248a6bbffd4509bc68 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 9483907
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 ba6c0b6d84b96e03b9fb4e161532f2c02b2cc575 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 90c9de3d0aac6569dde4f64918f2d2f0237404a759b973ed7200012eafefbb07 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 9488301
</span>
depends_patch-append port:autoconf
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-devel/files/0002-macos_hacks.diff b/emulators/wine-devel/files/0002-macos_hacks.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 8674bc44082..96d01b38da7 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/wine-devel/files/0002-macos_hacks.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-devel/files/0002-macos_hacks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -69,7 +69,7 @@ index b75963fef1d..cd112bfe4ee 100644
</span>
if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | REALTIME_PRIORITY_CLASS |
diff --git a/dlls/ntdll/unix/signal_x86_64.c b/dlls/ntdll/unix/signal_x86_64.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index fb5259d8714..15cc9abe595 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 19fee0186da..f279d7e08a5 100644
</span> --- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -88,6 +88,15 @@ WINE_DECLARE_DEBUG_CHANNEL(seh);
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -324,7 +324,7 @@ index fb5259d8714..15cc9abe595 100644
</span> +#ifdef __APPLE__
+ /* CW HACK 20186 */
+ if (handle_cet_nop( ucontext, &context.c )) return;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ /* Winehq bug 56441 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /* Winehq Bug 56441 */
</span> + if (handle_fndisi( ucontext, &context.c )) return;
+ /* CW HACK 23427 */
+ if (emulate_xgetbv( ucontext, &context.c )) return;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -346,7 +346,7 @@ index fb5259d8714..15cc9abe595 100644
</span> + "jmp " __ASM_LOCAL_LABEL("__wine_syscall_dispatcher_prolog_end") );
+
/**********************************************************************
<span style='display:block; white-space:pre;background:#ffe0e0;'>- * sigsys_handler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * sigsys_handler
</span> *
@@ -2308,6 +2519,23 @@ static void sigsys_handler( int signal, siginfo_t *siginfo, void *sigcontext )
frame->restore_flags |= CONTEXT_CONTROL;
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -397,7 +397,7 @@ index fb5259d8714..15cc9abe595 100644
</span> sig_act.sa_flags = SA_SIGINFO | SA_RESTART | SA_ONSTACK;
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c
<span style='display:block; white-space:pre;background:#ffe0e0;'>-index 2838472e7ba..3580ec0ad0c 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ca5d50b0fe6..ec10365ad7d 100644
</span> --- a/dlls/ntdll/unix/virtual.c
+++ b/dlls/ntdll/unix/virtual.c
@@ -70,6 +70,7 @@
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -476,7 +476,25 @@ index 2838472e7ba..3580ec0ad0c 100644
</span> {
ERR( "failed to remap the process USD: %d\n", res );
exit(1);
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -4224,6 +4259,8 @@ NTSTATUS virtual_handle_fault( EXCEPTION_RECORD *rec, void *stack )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4188,6 +4223,17 @@ NTSTATUS virtual_handle_fault( EXCEPTION_RECORD *rec, void *stack )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ WARN( "treating read fault in a readable page as a write fault, addr %p\n", addr );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ err = EXCEPTION_WRITE_FAULT;
</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;'>++ /* CW Hack 24945 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (err == EXCEPTION_WRITE_FAULT &&
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ((get_unix_prot( vprot ) & (PROT_WRITE | PROT_EXEC)) == (PROT_WRITE | PROT_EXEC)))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ FIXME( "HACK: write fault on a w|x page, addr %p\n", addr );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mprotect_range( page, page_size, 0, VPROT_EXEC );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ mprotect_range( page, page_size, VPROT_EXEC, 0 );
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ret = STATUS_SUCCESS;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ goto done;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (!is_inside_signal_stack( stack ) && (vprot & VPROT_GUARD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -4224,6 +4270,8 @@ NTSTATUS virtual_handle_fault( EXCEPTION_RECORD *rec, void *stack )
</span> ret = STATUS_SUCCESS;
}
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -485,7 +503,7 @@ index 2838472e7ba..3580ec0ad0c 100644
</span> mutex_unlock( &virtual_mutex );
rec->ExceptionCode = ret;
return ret;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6278,6 +6315,56 @@ NTSTATUS WINAPI NtReadVirtualMemory( HANDLE process, const void *addr, void *buf
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6278,6 +6326,56 @@ NTSTATUS WINAPI NtReadVirtualMemory( HANDLE process, const void *addr, void *buf
</span> return status;
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -542,7 +560,7 @@ index 2838472e7ba..3580ec0ad0c 100644
</span>
/***********************************************************************
* NtWriteVirtualMemory (NTDLL.@)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -6298,6 +6385,10 @@ NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *bu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -6298,6 +6396,10 @@ NTSTATUS WINAPI NtWriteVirtualMemory( HANDLE process, void *addr, const void *bu
</span> if ((status = wine_server_call( req ))) size = 0;
}
SERVER_END_REQ;
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-devel/files/0004-winemac.drv-export-essential-apis.diff b/emulators/wine-devel/files/0004-winemac.drv-export-essential-apis.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..faf6e5ecfbc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-devel/files/0004-winemac.drv-export-essential-apis.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,46 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/dlls/winemac.drv/macdrv.h b/dlls/winemac.drv/macdrv.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c086a47efc3..a2363a86ce5 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/dlls/winemac.drv/macdrv.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/dlls/winemac.drv/macdrv.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -193,8 +193,8 @@ extern BOOL macdrv_SystemParametersInfo(UINT action, UINT int_param, void *ptr_p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unsigned int swap_interval : 1; /* GL swap interval for window */
</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;'>+-extern struct macdrv_win_data *get_win_data(HWND hwnd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void release_win_data(struct macdrv_win_data *data);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern struct macdrv_win_data *get_win_data(HWND hwnd) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void release_win_data(struct macdrv_win_data *data) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void init_win_context(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern macdrv_window macdrv_get_cocoa_window(HWND hwnd, BOOL require_on_screen);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern RGNDATA *get_region_data(HRGN hrgn, HDC hdc_lptodp);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -202,6 +202,9 @@ extern BOOL macdrv_SystemParametersInfo(UINT action, UINT int_param, void *ptr_p
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void macdrv_handle_event(const macdrv_event *event);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern macdrv_view macdrv_get_cocoa_view(HWND hwnd) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern macdrv_view macdrv_get_client_cocoa_view(HWND hwnd) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void macdrv_window_close_requested(HWND hwnd);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void macdrv_window_frame_changed(HWND hwnd, const macdrv_event *event);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void macdrv_window_got_focus(HWND hwnd, const macdrv_event *event);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/dlls/winemac.drv/macdrv_cocoa.h b/dlls/winemac.drv/macdrv_cocoa.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 20d82b9bef8..44614ae3e8a 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/dlls/winemac.drv/macdrv_cocoa.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/dlls/winemac.drv/macdrv_cocoa.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -560,11 +560,11 @@ extern void macdrv_order_cocoa_window(macdrv_window w, macdrv_window prev,
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void macdrv_set_view_hidden(macdrv_view v, int hidden);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void macdrv_add_view_opengl_context(macdrv_view v, macdrv_opengl_context c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void macdrv_remove_view_opengl_context(macdrv_view v, macdrv_opengl_context c);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern macdrv_metal_device macdrv_create_metal_device(void);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void macdrv_release_metal_device(macdrv_metal_device d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-extern void macdrv_view_release_metal_view(macdrv_metal_view v);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern macdrv_metal_device macdrv_create_metal_device(void) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void macdrv_release_metal_device(macdrv_metal_device d) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern macdrv_metal_view macdrv_view_create_metal_view(macdrv_view v, macdrv_metal_device d) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern macdrv_metal_layer macdrv_view_get_metal_layer(macdrv_metal_view v) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++extern void macdrv_view_release_metal_view(macdrv_metal_view v) __attribute__((visibility("default")));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern int macdrv_get_view_backing_size(macdrv_view v, int backing_size[2]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern void macdrv_set_view_backing_size(macdrv_view v, const int backing_size[2]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ extern uint32_t macdrv_window_background_color(void);
</span></pre><pre style='margin:0'>
</pre>