From nobody Sun Aug 11 17:40:05 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4WhlKK48qyz5THg1; Sun, 11 Aug 2024 17:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WhlKK3Qszz4LMs; Sun, 11 Aug 2024 17:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723398005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uxYXEw5TZflgj9TLOX5PxpzKuPlU8TsOoBIH3cesEqk=; b=a4ACxNDa1ZTwsmju+SD0RQunO9TN+IDATZPDhkSY2nWK7PMvJV8VBP8tZt9ilrdrCmOxEy 4GmHcKlGx58OpEG4cn+xjJl1f+SDd7wICLwNkfoTAmJhNQK8fYW2g3cdNxzUuS04AdwOAs e6ZX+9v2XcRuNKR8oxuEIgqt7pi4mMLOIUgvfjedjm33zVuo9O1kSxVgJxzXYmKIYVMblb 8MH2e9S4BpnVGAVuAK4e+CS/Yl31u0GzG/elL/Pp3Nf+X7tRFsmb2N0n7danEbVdw+r21A MZo0ZUMdvywqwH80BOrk2KLgUgsgjP9M7d5xgjzC4h7k3+Aq0ZrR+ERXVIFGyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723398005; a=rsa-sha256; cv=none; b=w+mZDHzjm6AScpgAiBiLbxTmb6uXqfl28/+fMhLLXK5Zgu3u85N0aRTKIzmZ6Iv7CFU3en wWIi/INaGY+ssO01YnH0Dg0PtOeIKt+qo72ZClNFB+B6DgQUy0wjFU5p5rgPNqnnWfOWfI Mh/0VchpsxCUgRudNjqte0lC4vxr77G1nRNznW4DyxGlejRtFENatQlB3bhovqya7zPEHN d1upDb+0KxO9S/YS2jtN6VqvWEP7Ypdyo/c7eV8/pKEUHuDyVekExh2lFt48cdlNiQ0k1b 7bYSkZWr8DIXxDLFyaDPWVegJiaXSp58cqRZSaRP84a0EA854sdfXYV42DRX/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723398005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uxYXEw5TZflgj9TLOX5PxpzKuPlU8TsOoBIH3cesEqk=; b=vlCptPUznr0nnBU9+/bDQq4sUFczLFvA6W0nFUrgRkwF2hmPs1vMtKRdI2c1BelGVU1naM ycn5dDceyXQcz2VO01YhFl6fdxuyv5BsgkOsnrX1kWB9Ub84GRI7NMJq/SqcPk+IGdRYvI 0QhgjQS/uHykrcg3gW197EIOngwFRXc0ANxph+GY2WfJsYTeGcdx8lw9on2fiepDNwonrR b+zFbwVzCIOQDkWhJvdMmjdgokUCAL9u9SVbf5vC1WBRDpq7GS5u3H6T4DpqlWJuKxxC/C wlqwnvyFNIdtC1ayhB3dWk/Hfl6wAf7IXEBYg5yiPjhD9f1Y3fL8Kc3KUb4IwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4WhlKK2T0LztFJ; Sun, 11 Aug 2024 17:40:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47BHe5Td078070; Sun, 11 Aug 2024 17:40:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47BHe541078065; Sun, 11 Aug 2024 17:40:05 GMT (envelope-from git) Date: Sun, 11 Aug 2024 17:40:05 GMT Message-Id: <202408111740.47BHe541078065@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gerald Pfeifer Subject: git: 1b6aacb7f254 - main - emulators/wine-devel: Update to Wine 9.15 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gerald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1b6aacb7f25430b93d85052f64eb9f53227409d9 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=1b6aacb7f25430b93d85052f64eb9f53227409d9 commit 1b6aacb7f25430b93d85052f64eb9f53227409d9 Author: Gerald Pfeifer AuthorDate: 2024-08-11 17:33:59 +0000 Commit: Gerald Pfeifer 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 -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)