Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 9 Sep 2024 05:31:19 GMT
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: aae763e70ca5 - main - emulators/wine: Update explanation for local patch
Message-ID:  <202409090531.4895VJF1063942@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=aae763e70ca585e1152384992aad64c5875fed54

commit aae763e70ca585e1152384992aad64c5875fed54
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2024-09-09 05:28:28 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2024-09-09 05:28:28 +0000

    emulators/wine: Update explanation for local patch
    
    files/patch-include_wine_asm.h has now gone upstream in a somewhat
    more expansive form. Note to drop our version when upgrading. (The
    upstream patch does not directly apply to Wine 9.0.)
---
 emulators/wine/files/patch-include_wine_asm.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/emulators/wine/files/patch-include_wine_asm.h b/emulators/wine/files/patch-include_wine_asm.h
index 3e3f76da8d7e..eccc019cc86b 100644
--- a/emulators/wine/files/patch-include_wine_asm.h
+++ b/emulators/wine/files/patch-include_wine_asm.h
@@ -4,9 +4,10 @@ users confirming in PR 279927 and PR 280000 this fixes
   002c:err:seh:NtRaiseException Unhandled exception code c0000005 flags 0 addr 0x6ffffff8b2b7
   0024:err:seh:NtRaiseException Unhandled exception code c0000005 flags 0 addr 0x6ffffff8b2b7 
 
-for them. Of course this should better be addressed via upstream (which
-we'll try to do).
+for them.
 
+Upstream Wine has a more complete patch in the meantime; drop this one
+when moving to the major release post 9.0.
 
 --- UTC
 --- include/wine/asm.h.orig	2024-02-24 10:23:40.551780000 +0300



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202409090531.4895VJF1063942>