<pre style='margin:0'>
Perry E. Metzger (pmetzger) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/843f259464dfd45863db8e2f57d9698fc99d20eb">https://github.com/macports/macports-ports/commit/843f259464dfd45863db8e2f57d9698fc99d20eb</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 843f259464d wine-stable: Force older deployment target & rev-bump
</span>843f259464d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 843f259464dfd45863db8e2f57d9698fc99d20eb
</span>Author: Dean M Greer <38226388+Gcenx@users.noreply.github.com>
AuthorDate: Tue Jul 9 18:51:17 2024 -0400
<span style='display:block; white-space:pre;color:#404040;'> wine-stable: Force older deployment target & rev-bump
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Co-Authored-By: Brendan Shanks <780632+mrpippy@users.noreply.github.com>
</span>---
emulators/wine-stable/Portfile | 14 +++-----
emulators/wine-stable/files/macos_hacks.diff | 50 ++++++++++++++++++++++++++--
2 files changed, 52 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-stable/Portfile b/emulators/wine-stable/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 68474e8304c..40eb2a9b7b5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/wine-stable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-stable/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -12,7 +12,7 @@ github.tarball_from archive
</span> name wine-stable
conflicts wine-devel wine-staging wine-crossover
set my_name wine
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> platforms {darwin >= 19}
set branch [lindex [split ${version} .] 0].0
license LGPL-2.1+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -130,15 +130,9 @@ configure.ldflags-append -Wl,-rpath,${compiler.library_path}
</span> # FSF GCC cannot compile code using Apple's "blocks" language extensions
compiler.blacklist-append {*gcc*} {clang < 800} {macports-clang-3.*}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-if {${os.major} > 23} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Xcode16 default SDK causes the build to fail so fallback to a working SDK
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.sdk_version 14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.sdkroot} != "${developer_dir}/SDKs/MacOSX${configure.sdk_version}.sdk"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-fetch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- error "Building ${name} requires the MacOSX${configure.sdk_version}.sdk to be present in ${developer_dir}/SDKs/"
</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:#e0ffe0;'>+# Setting an older deployment target avoids build error with MacOSX15.sdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://gitlab.winehq.org/wine/wine/-/merge_requests/5935#note_74758
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+macosx_deployment_target 10.15
</span>
# Makes destroot take significantly longer
variant dev description "Install ${subport} development environment" {
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/emulators/wine-stable/files/macos_hacks.diff b/emulators/wine-stable/files/macos_hacks.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index d8bfd832317..c5d6b8bea40 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/emulators/wine-stable/files/macos_hacks.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/emulators/wine-stable/files/macos_hacks.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -537,7 +537,7 @@ index 803d8079213..b1723851e97 100644
</span> }
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 ab544908883..e433d69ce97 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index ab544908883..231c7f0ede0 100644
</span> --- a/dlls/ntdll/unix/signal_x86_64.c
+++ b/dlls/ntdll/unix/signal_x86_64.c
@@ -1004,7 +1004,11 @@ NTSTATUS WINAPI NtSetContextThread( HANDLE handle, const CONTEXT *context )
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -719,7 +719,53 @@ index ab544908883..e433d69ce97 100644
</span> break;
case TRAP_x86_STKFLT: /* Stack fault */
rec.ExceptionCode = EXCEPTION_STACK_OVERFLOW;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2492,6 +2640,8 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2170,6 +2318,34 @@ static void usr1_handler( int signal, siginfo_t *siginfo, void *sigcontext )
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/* CW HACK 22350 */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++/**********************************************************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * sigsys_handler
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ *
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Handler for SIGSYS, signals that a non-existent system call was invoked.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ * Only called on macOS 14 Sonoma and later.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++static void sigsys_handler( int signal, siginfo_t *siginfo, void *sigcontext )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++{
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ extern const void *__wine_syscall_dispatcher_prolog_end_ptr;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ struct syscall_frame *frame = amd64_thread_data()->syscall_frame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ucontext_t *ctx = sigcontext;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ TRACE_(seh)("SIGSYS, rax %#llx, rip %#llx.\n", RAX_sig(ctx), RIP_sig(ctx));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ frame->rip = RIP_sig(ctx) + 0xb;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ frame->rcx = RIP_sig(ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ frame->eflags = EFL_sig(ctx);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ frame->restore_flags = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RCX_sig(ctx) = (ULONG_PTR)frame;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ R11_sig(ctx) = frame->eflags;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ EFL_sig(ctx) &= ~0x100; /* clear single-step flag */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ RIP_sig(ctx) = (ULONG64)__wine_syscall_dispatcher_prolog_end_ptr;
</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;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /***********************************************************************
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * LDT support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2460,6 +2636,10 @@ void signal_init_process(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sigaction( SIGSEGV, &sig_act, NULL ) == -1) goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sigaction( SIGILL, &sig_act, NULL ) == -1) goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (sigaction( SIGBUS, &sig_act, NULL ) == -1) goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ sig_act.sa_sigaction = sigsys_handler;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (sigaction( SIGSYS, &sig_act, NULL ) == -1) goto error;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ error:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2492,6 +2672,8 @@ void call_init_thunk( LPTHREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB
</span> __asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->Tib.Self), "n" (FIELD_OFFSET(TEB, Tib.Self)));
__asm__ volatile (".byte 0x65\n\tmovq %0,%c1" :: "r" (teb->ThreadLocalStoragePointer), "n" (FIELD_OFFSET(TEB, ThreadLocalStoragePointer)));
thread_data->pthread_teb = mac_thread_gsbase();
</pre><pre style='margin:0'>
</pre>