CVS commit: pkgsrc/emulators/wine

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Oct 27 14:43:42 UTC 2026

Modified Files:
        pkgsrc/emulators/wine: Makefile distinfo
        pkgsrc/emulators/wine/patches: patch-dlls_ntdll_unix_signal__x86__64.c

Log Message:
wine: add workaround for PR 60539

>From riastradh. Requested from pgoyette via pkgsrc-users.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.282 -r1.283 pkgsrc/emulators/wine/Makefile
cvs rdiff -u -r1.100 -r1.101 pkgsrc/emulators/wine/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/emulators/wine/patches/patch-dlls_ntdll_unix_signal__x86__64.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/wine/Makefile
diff -u pkgsrc/emulators/wine/Makefile:1.282 pkgsrc/emulators/wine/Makefile:1.283
--- pkgsrc/emulators/wine/Makefile:1.282        Tue Sep 29 06:04:59 2026
+++ pkgsrc/emulators/wine/Makefile      Tue Oct 27 14:43:42 2026
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.282 2026/09/29 06:04:59 wiz Exp $
+# $NetBSD: Makefile,v 1.283 2026/10/27 14:43:42 wiz Exp $
 
 DISTNAME=      wine-9.0
-PKGREVISION=   17
+PKGREVISION=   18
 CATEGORIES=    emulators
 MASTER_SITES=  https://dl.winehq.org/wine/source/${PKGVERSION_NOREV}/
 MASTER_SITES+= http://mirrors.ibiblio.org/wine/source/${PKGVERSION_NOREV}/

Index: pkgsrc/emulators/wine/distinfo
diff -u pkgsrc/emulators/wine/distinfo:1.100 pkgsrc/emulators/wine/distinfo:1.101
--- pkgsrc/emulators/wine/distinfo:1.100        Fri Nov  1 14:10:47 2024
+++ pkgsrc/emulators/wine/distinfo      Tue Oct 27 14:43:42 2026
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.100 2024/11/01 14:10:47 triaxx Exp $
+$NetBSD: distinfo,v 1.101 2026/10/27 14:43:42 wiz Exp $
 
 BLAKE2s (wine-9.0.tar.xz) = 50a4cd0fc55ba58dd376ea9804fd7f9001fb9047aa0384ff9d447073de1cae73
 SHA512 (wine-9.0.tar.xz) = 838daf2c4581f83f8573b988036f517d57b84894b090a2a17433255d6d044dfa880e6724cdb83082a36c333df9d2083ab68ae53927622a620edd59f33462ada4
@@ -7,7 +7,7 @@ SHA1 (patch-configure) = b8c29d671a10f16
 SHA1 (patch-dlls_nsiproxy.sys_ip.c) = 2958989e7f59bc5515e89a2a3980ad0f0b127f4a
 SHA1 (patch-dlls_nsiproxy.sys_ndis.c) = 7a8ac98892306eb6cd6d89c3ef5af48b9c2d70ea
 SHA1 (patch-dlls_ntdll_unix_file.c) = ce826279dcf5aebe74c041d647f6d0b41ddd6630
-SHA1 (patch-dlls_ntdll_unix_signal__x86__64.c) = be196f1b45c92c225f89295aa2caf7d46aea35be
+SHA1 (patch-dlls_ntdll_unix_signal__x86__64.c) = bed212fd7d93d622195fcb1c94f50e89c43f2922
 SHA1 (patch-dlls_wineoss.drv_ossmidi.c) = 066d2eed25c11052fc6c47d29e8fa2dd98f02fb1
 SHA1 (patch-include_config.h.in) = fc0c3f00adcc7f12cce11efeb9c869857c1f1907
 SHA1 (patch-tools_winegcc_winegcc.c) = db786a9f2626c640ffad3ef660f0af34e2e8eb79

Index: pkgsrc/emulators/wine/patches/patch-dlls_ntdll_unix_signal__x86__64.c
diff -u pkgsrc/emulators/wine/patches/patch-dlls_ntdll_unix_signal__x86__64.c:1.1 pkgsrc/emulators/wine/patches/patch-dlls_ntdll_unix_signal__x86__64.c:1.2
--- pkgsrc/emulators/wine/patches/patch-dlls_ntdll_unix_signal__x86__64.c:1.1   Fri Nov  1 14:10:47 2024
+++ pkgsrc/emulators/wine/patches/patch-dlls_ntdll_unix_signal__x86__64.c       Tue Oct 27 14:43:42 2026
@@ -1,9 +1,22 @@
-$NetBSD: patch-dlls_ntdll_unix_signal__x86__64.c,v 1.1 2024/11/01 14:10:47 triaxx Exp $
+$NetBSD: patch-dlls_ntdll_unix_signal__x86__64.c,v 1.2 2026/10/27 14:43:42 wiz Exp $
 
+1. chunk:
+Workaround for PR kern/60539: XSAVE changes break ucontext userspace API.
+
+2. chunk:
 Fix signal definition for NetBSD.
 
 --- dlls/ntdll/unix/signal_x86_64.c.orig       2024-01-16 20:55:47.000000000 +0000
 +++ dlls/ntdll/unix/signal_x86_64.c
+@@ -203,7 +203,7 @@ __ASM_GLOBAL_FUNC( alloc_fs_sel,
+ #define RSP_sig(context)    (*((unsigned long*)&(context)->uc_mcontext.__gregs[_REG_URSP]))
+ #define TRAP_sig(context)   ((context)->uc_mcontext.__gregs[_REG_TRAPNO])
+ #define ERROR_sig(context)  ((context)->uc_mcontext.__gregs[_REG_ERR])
+-#define FPU_sig(context)    ((XMM_SAVE_AREA32 *)((context)->uc_mcontext.__fpregs))
++#define FPU_sig(context)    ((XMM_SAVE_AREA32 *)(&(context)->uc_mcontext.__fpregs))
+ #define XState_sig(context) NULL
+ 
+ #elif defined (__APPLE__)
 @@ -316,8 +316,13 @@ enum i386_trap_code
      TRAP_x86_PAGEFLT    = T_PAGEFLT,    /* Page fault */
      TRAP_x86_ARITHTRAP  = T_ARITHTRAP,  /* Floating point exception */