git: 1b6aacb7f254 - main - emulators/wine-devel: Update to Wine 9.15

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Gerald Pfeifer <gerald_at_FreeBSD.org>
Date: Sun, 11 Aug 2024 17:40:05 UTC
The branch main has been updated by gerald:

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

commit 1b6aacb7f25430b93d85052f64eb9f53227409d9
Author:     Gerald Pfeifer <gerald@FreeBSD.org>
AuthorDate: 2024-08-11 17:33:59 +0000
Commit:     Gerald Pfeifer <gerald@FreeBSD.org>
CommitDate: 2024-08-11 17:38:02 +0000

    emulators/wine-devel: Update to Wine 9.15
    
    This includes the following changes:
     - Prototype and constructor objects in MSHTML.
     - More support for ODBC Windows drivers (which we haven't enabled).
     - Various bug fixes.
    
    files/patch-include_wine_asm.h has made it upstream in slightly
    different form, so remove it.
    
    My patch files/patch-nsiproxy.sys-buildfix has made it upstream,
    so remove it.
    
    And files/patch-configure requires updating due to changed patch
    context (alas no change to the patch itself).
---
 emulators/wine-devel/Makefile                      |  3 +-
 emulators/wine-devel/distinfo                      |  6 ++--
 emulators/wine-devel/files/patch-configure         | 22 ++++++-------
 .../wine-devel/files/patch-include_wine_asm.h      | 24 --------------
 .../wine-devel/files/patch-nsiproxy.sys-buildfix   | 38 ----------------------
 5 files changed, 15 insertions(+), 78 deletions(-)

diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile
index 802cb92f12ee..5cee1934abec 100644
--- a/emulators/wine-devel/Makefile
+++ b/emulators/wine-devel/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	wine
-DISTVERSION=	9.14
-PORTREVISION=	1
+DISTVERSION=	9.15
 PORTEPOCH=	1
 CATEGORIES=	emulators
 MASTER_SITES=	https://dl.winehq.org/wine/source/9.x/
diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo
index 660e16b5e1d3..731df45e50bc 100644
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1722413658
-SHA256 (wine-9.14.tar.xz) = 24572f49cf3473fc9ef2a1ad1cddf511ce0ef43daa55413b4720a6c3e3c89ea6
-SIZE (wine-9.14.tar.xz) = 30561796
+TIMESTAMP = 1723332045
+SHA256 (wine-9.15.tar.xz) = 79adef436dd68ddbd70178670a3c23aa98e8afd5540ac0f42345894c458b78dd
+SIZE (wine-9.15.tar.xz) = 30580680
diff --git a/emulators/wine-devel/files/patch-configure b/emulators/wine-devel/files/patch-configure
index ece5103ce34a..1b505cb0fd84 100644
--- a/emulators/wine-devel/files/patch-configure
+++ b/emulators/wine-devel/files/patch-configure
@@ -1,12 +1,12 @@
 --- UTC
---- configure.orig	2023-02-02 21:17:09.000000000 +0000
-+++ configure	2023-05-01 21:19:03.739461000 +0000
-@@ -10696,7 +10696,7 @@
-         fi
-         llvm_extra_cflags="-target $llvm_target -fuse-ld=lld"
-         case $llvm_target in
--          *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;;
-+          *windows) llvm_cflags="-Wl,-subsystem:console" ;;
-         esac
-         { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags" | $as_tr_sh`
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags" >&5
+--- configure.orig	2024-08-10 14:38:54.000000000 +0000
++++ configure	2024-08-10 23:43:05.264405000 +0000
+@@ -10662,7 +10662,7 @@
+     llvm_extra_ldflags=""
+     llvm_cflags=""
+     case $llvm_target in
+-      *windows) llvm_cflags="-Wl,-subsystem:console -Wl,-WX" ;;
++      *windows) llvm_cflags="-Wl,-subsystem:console" ;;
+     esac
+     { as_ac_var=`printf "%s\n" "ac_cv_${wine_arch}_cflags_$llvm_extra_cflags $llvm_cflags --no-default-config" | $as_tr_sh`
+ { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether $CC supports $llvm_extra_cflags $llvm_cflags --no-default-config" >&5
diff --git a/emulators/wine-devel/files/patch-include_wine_asm.h b/emulators/wine-devel/files/patch-include_wine_asm.h
deleted file mode 100644
index 3f5494664270..000000000000
--- a/emulators/wine-devel/files/patch-include_wine_asm.h
+++ /dev/null
@@ -1,24 +0,0 @@
-This patch is borrowed from emulators/wine-proton. According to several
-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).
-
-
---- include/wine/asm.h.orig	2024-02-24 10:23:40.551780000 +0300
-+++ include/wine/asm.h	2024-02-24 10:23:43.285931000 +0300
-@@ -242,9 +242,9 @@
-                        ".byte 0x75,0x03\n\t"      /* jne 1f */ \
-                        ".byte 0x0f,0x05\n\t"      /* syscall */ \
-                        ".byte 0xc3\n\t"           /* ret */ \
--                       "jmp 1f\n\t" \
-+                       ".byte 0xeb,0x01\n\t"      /* jmp 1f */ \
-                        ".byte 0xc3\n"             /* ret */ \
--                       "1:\t.byte 0xff,0x14,0x25\n\t" /* 1: callq *(0x7ffe1000) */ \
-+                       ".byte 0xff,0x14,0x25\n\t" /* 1: callq *(0x7ffe1000) */ \
-                        ".long 0x7ffe1000\n\t" \
-                        "ret" )
- # else
diff --git a/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix b/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix
deleted file mode 100644
index f138e5d3e075..000000000000
--- a/emulators/wine-devel/files/patch-nsiproxy.sys-buildfix
+++ /dev/null
@@ -1,38 +0,0 @@
-commit ba1393465b53e0ef251e3a62b632c4d1b326433e
-Author: Gerald Pfeifer <gerald@pfeifer.com>
-Date:   Wed Jul 31 09:21:52 2024 +0200
-
-    nsiproxy.sys: Fix the build on non-Apple, non-Linux systems
-    
-    commit 5261811d471 revamped the code around pcblist structures,
-    alas assumes a variable mib is always present on non-Apple, non-Linux
-    systems when it is not. And in any case, ARRAY_SIZE should be used for
-    the actual structure it applies to, not a similar one.
-
---- UTC
-diff --git a/dlls/nsiproxy.sys/tcp.c b/dlls/nsiproxy.sys/tcp.c
-index 67dcfed19f3..dd8c9d1102a 100644
---- dlls/nsiproxy.sys/tcp.c
-+++ dlls/nsiproxy.sys/tcp.c
-@@ -645,7 +645,7 @@ static NTSTATUS tcp_conns_enumerate_all( UINT filter, struct nsi_tcp_conn_key *k
-         pthread_once( &mib_init_once, init_pcblist64_mib );
- #else
-         int pcblist_mib[] = { CTL_NET, PF_INET, IPPROTO_TCP, TCPCTL_PCBLIST };
--        size_t pcblist_mib_len = ARRAY_SIZE(mib);
-+        size_t pcblist_mib_len = ARRAY_SIZE(pcblist_mib);
- #endif
- 
-         if (sysctl( pcblist_mib, pcblist_mib_len, NULL, &len, NULL, 0 ) < 0)
-diff --git a/dlls/nsiproxy.sys/udp.c b/dlls/nsiproxy.sys/udp.c
-index 3cb215c1c58..80d6d1aa89f 100644
---- dlls/nsiproxy.sys/udp.c
-+++ dlls/nsiproxy.sys/udp.c
-@@ -316,7 +316,7 @@ static NTSTATUS udp_endpoint_enumerate_all( void *key_data, UINT key_size, void
-         pthread_once( &mib_init_once, init_pcblist64_mib );
- #else
-         int pcblist_mib[] = { CTL_NET, PF_INET, IPPROTO_UDP, UDPCTL_PCBLIST };
--        size_t pcblist_mib_len = ARRAY_SIZE(mib);
-+        size_t pcblist_mib_len = ARRAY_SIZE(pcblist_mib);
- #endif
- 
-         if (sysctl( pcblist_mib, pcblist_mib_len, NULL, &len, NULL, 0 ) < 0)