From nobody Mon Nov 17 02:40:06 2025 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 4d8sRC2DRyz6GLy0; Mon, 17 Nov 2025 02:40:07 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4d8sRC1XCcz40wD; Mon, 17 Nov 2025 02:40:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763347207; 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=PZ1QmWz7e13Q2M9wJKqa1u9Q1X6g6RmH+A+xbqnIXa0=; b=LA+KEXEfaNvpw0lqNrNri+TyOqIT8hCN0zCkZ0X/jR8lOjlw71eQXuFG1N9fCfggorCL2S RD4Mxm02syl7iirfp9kyD1J8Oaj06oR51NOzgvuRuo4nPbg9h83ShjTc3bhGYdzjcVgC6o SOcwb9m4HksPITvuSzz98XVnpTsVt2AdZLAgtQgHQ9l+aJ5l7+SF0g6zfI8whznDMCSSUR HeTYPvNSjHvXP1FaxPBITGrQEiscu9fCnRvx2KQxDY5EgpUC93tGWpfXtpcjwwNJduXeoZ FulgFf8CcmZ/H+FNXBtQEeDVRhmBwJXBHkMkd5BRwd4HKPSme5bOMqdmBS4TSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763347207; 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=PZ1QmWz7e13Q2M9wJKqa1u9Q1X6g6RmH+A+xbqnIXa0=; b=Y5tF54mkFBIguCVpNA0oFszqVpmtHF/WIVLv1FYwoHjw/uFVfT9dHNzN9zoMIK7mTkdDmx YqmbZYQ6ZzLorgn5i75JViI5Eobziq31l1rBXSflYskZ9kTmWHo8xe7MT51iDy3PKvy6jK 9ES0vs+MWioVjECqjkyHyTxxaeOseVfSTqhY6f5GHXorlnsTvEXBHgMS/J1+rtlXBYt2QU 3m3fLFi7aPVTZpiJvn3bbqFLYdNICUHiH/Ru3xhy9hSjmyqXWYVMajBZKkANalZToFsLm3 kymuZPPQdtsE7x64xv4Tc6lI+ylHKS2kLfIAejK7iX5KEArbsZDdT4jddsbiqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763347207; a=rsa-sha256; cv=none; b=IRy1yMjgiByttlnw/LikWinagwBhKdMT7lH/yn457eWqeThZbcgS7GCb8wyfXPogmGZZF5 lt2rcUZMUNVZro5pMCGOCQWZYhSGJDUDSHu9348hHua5JSJTxbx82DkoCWd3d2LPVXML5S 5jyDTVWesxFsXoeSlsl97+wetp6uMh/9aWoQZW7eep2C1YSUNkyS3uEcLB8JViemCABk/W Ce1UEG8GU+rtBMPkaROVPKmNVCZnIp8pmqyDM4yUi6tX0yPkHNJOicZpJ6F+8qXzm80mCQ dMrwUyrh66RxW0bh7SEbCwtdzOdJGAp2RKpHPEGRlFCP+PTu/xW/RmA2mpkssw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4d8sRC0rjRz14cV; Mon, 17 Nov 2025 02:40:07 +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 5AH2e63v030122; Mon, 17 Nov 2025 02:40:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5AH2e6bC030117; Mon, 17 Nov 2025 02:40:06 GMT (envelope-from git) Date: Mon, 17 Nov 2025 02:40:06 GMT Message-Id: <202511170240.5AH2e6bC030117@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: b3547710ed91 - main - emulators/wine-devel: Update 10.18 => 10.19 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: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3547710ed9179d2447f63a783c8b757800ec433 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3547710ed9179d2447f63a783c8b757800ec433 commit b3547710ed9179d2447f63a783c8b757800ec433 Author: Thibault Payet AuthorDate: 2025-11-17 02:36:29 +0000 Commit: Vladimir Druzenko CommitDate: 2025-11-17 02:36:29 +0000 emulators/wine-devel: Update 10.18 => 10.19 Changelog: - Support for reparse points. - More support for WinRT exceptions. - Refactoring of Common Controls after the v5/v6 split. - Typed Arrays support in JScript. - Various bug fixes. https://gitlab.winehq.org/wine/wine/-/releases/wine-10.19 Remove files/patch-dlls_ntdll_unix_signal__i386.c since the issue was fixed upstream. Re-order GECKO and MONO at the end. PR: 291049 --- emulators/wine-devel/Makefile | 7 ++++--- emulators/wine-devel/distinfo | 6 +++--- .../wine-devel/files/extra-patch-tools-winebuild-res32 | 14 +++++++------- .../wine-devel/files/patch-dlls_ntdll_unix_signal__i386.c | 11 ----------- emulators/wine-devel/pkg-plist | 1 + 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 87520160aa8b..abc3e7c7ad52 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,6 +1,5 @@ PORTNAME= wine -DISTVERSION= 10.18 -PORTREVISION= 1 +DISTVERSION= 10.19 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/10.x/ @@ -68,7 +67,9 @@ SUB_FILES= pkg-message PORTDATA= wine.inf -OPTIONS_DEFINE= CUPS DOCS DOSBOX FFMPEG GECKO GNUTLS MONO V4L WAYLAND X11 +# GECKO and MONO are intentionally kept at the end since they are just +# used to depends at runtime on wine-gecko-devel and wine-mono-devel +OPTIONS_DEFINE= CUPS DOCS DOSBOX FFMPEG GNUTLS V4L WAYLAND X11 GECKO MONO OPTIONS_DEFAULT= ALSA FFMPEG GNUTLS WAYLAND X11 OPTIONS_RADIO= AUDIO OPTIONS_RADIO_AUDIO= ALSA OSS diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 930ce6712983..87281014b61a 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1761986980 -SHA256 (wine-10.18.tar.xz) = 51fb7273d65d09dea032c4a5e2197b12724b27ca360e1a622b2373d1ee50ad7b -SIZE (wine-10.18.tar.xz) = 32970828 +TIMESTAMP = 1763308228 +SHA256 (wine-10.19.tar.xz) = 7cec58323c6f2aaee7aca93517379cbbfef96e2c2c580c68ff85dd000cbbdd46 +SIZE (wine-10.19.tar.xz) = 33032428 diff --git a/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 b/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 index 7c6c62b9fe58..4c77701ff27a 100644 --- a/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 +++ b/emulators/wine-devel/files/extra-patch-tools-winebuild-res32 @@ -27,7 +27,7 @@ to minimize divergence and risk on 64-bit x86). const void *data; unsigned int data_size; unsigned int data_offset; -@@ -158,6 +156,28 @@ static void put_string( const struct string_id *str ) +@@ -139,6 +137,28 @@ static void put_string( const struct string_id *str ) } } @@ -56,7 +56,7 @@ to minimize divergence and risk on 64-bit x86). /* check the file header */ /* all values must be zero except header size */ static int check_header(void) -@@ -179,7 +199,7 @@ static int check_header(void) +@@ -160,7 +180,7 @@ static int check_header(void) } /* load the next resource from the current file */ @@ -64,8 +64,8 @@ to minimize divergence and risk on 64-bit x86). +static void load_next_resource( DLLSPEC *spec ) { unsigned int hdr_size; - struct resource *res = add_resource( spec ); -@@ -189,9 +209,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name ) + struct resource *res = ARRAY_ADD( &spec->resources, struct resource ); +@@ -170,9 +190,6 @@ static void load_next_resource( DLLSPEC *spec, const char *name ) if (hdr_size & 3) fatal_error( "%s header size not aligned\n", input_buffer_filename ); if (hdr_size < 32) fatal_error( "%s invalid header size %u\n", input_buffer_filename, hdr_size ); @@ -75,7 +75,7 @@ to minimize divergence and risk on 64-bit x86). res->data = input_buffer + input_buffer_pos - 2*sizeof(unsigned int) + hdr_size; if ((const unsigned char *)res->data < input_buffer || (const unsigned char *)res->data >= input_buffer + input_buffer_size) -@@ -220,7 +237,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) +@@ -201,7 +218,7 @@ int load_res32_file( const char *name, DLLSPEC *spec ) if ((ret = check_header())) { @@ -84,10 +84,10 @@ to minimize divergence and risk on 64-bit x86). } return ret; } -@@ -473,7 +490,7 @@ void output_resources( DLLSPEC *spec ) +@@ -441,7 +458,7 @@ void output_resources( DLLSPEC *spec ) { output( "\n\t.balign 4\n" ); - output( ".L__wine_spec_res_%d:\n", i ); + output( ".L__wine_spec_res_%d:\n", i++ ); - output( "\t.incbin \"%s\",%d,%d\n", res->input_name, res->input_offset, res->data_size ); + dump_res_data( res ); } diff --git a/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__i386.c b/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__i386.c deleted file mode 100644 index bdabb53ea341..000000000000 --- a/emulators/wine-devel/files/patch-dlls_ntdll_unix_signal__i386.c +++ /dev/null @@ -1,11 +0,0 @@ ---- dlls/ntdll/unix/signal_i386.c.orig 2025-10-03 21:01:38 UTC -+++ dlls/ntdll/unix/signal_i386.c -@@ -827,7 +827,7 @@ static void fixup_frame_fpu_state( struct syscall_fram - if (FPUX_sig(sigcontext)) - { - if (user_shared_data->ProcessorFeatures[PF_XMMI_INSTRUCTIONS_AVAILABLE]) -- frame->u.xsave = *FPUX_sig(sigcontext); -+ frame->u.xsave = *((XSAVE_FORMAT *) FPUX_sig(sigcontext)); - else - fpux_to_fpu( &frame->u.fsave, FPUX_sig(sigcontext) ); - frame->xstate.Mask = XSTATE_MASK_LEGACY; diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index cbbfdee6007e..6f46bfa155cc 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -98,6 +98,7 @@ include/wine/msvcrt/wchar.h include/wine/msvcrt/wctype.h include/wine/svcctl.h include/wine/svcctl.idl +include/wine/unixlib.h include/wine/windows/accctrl.h include/wine/windows/access.idl include/wine/windows/aclapi.h