From nobody Mon Sep 09 05:31:19 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 4X2Fn42TfWz5VD81; Mon, 09 Sep 2024 05:31:20 +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 4X2Fn40V41z4F1n; Mon, 9 Sep 2024 05:31:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725859880; 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=jysb5HR7GRo3yFSdTdQ/Cc/sYoYW1kQh8FpOXQliod8=; b=GsvOu9Vk22uUvFaVrTRYOwBcPd1p9YAlD6EqPSnBwa/+EvwC2hjxR2ZitDuxuJi+54pTcl 347flOnTOsbUf/t/rohiqv4GNpVfLzkpd6hbfQ46otJmFD8N39aUHS8Vg+GQu16SSsJ+Xj MFCVdoSe4XBxtEQg9Q0YDWi7fuXiWiWpKs4Sa5eu7r0wm2kUMEf8lTvuCG5rpvynsamy7o 5u2ft1G3tRpCQRUE5UAk0uBrcanT08ItzAgL3ssFCnlTiRBD1hZ0qVmb+ho7JBWsH5cXcz TdvnvAatZkWXhBvj1DzV6onr4h0dAQ8+DLJJrACPe1o1StDyqdJPszQEHfQSbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725859880; a=rsa-sha256; cv=none; b=x0qfPqxWZo8yIoUfEzctOsEDoVnIgr49Yg+ABeA8SGX4pirL5wQvMlmHRs87RTx6Z2EZtV LVKueMRPIqdtitBtSvt0DwwD1td9UBrfacb/vOL+sctniwQM+UkXtcGM2ZRb1qY1myrLkO KGW3DwEFYA7HnR7HdF19rqIl2BZ5AvRwUD8hP8X3uK2ov0BDhkfkKjd3QErLTk422OAS4j O25S33pJgX1WUdRPMzD51VBiLHjb/h+2WIj7L41LzmrGCWo+Ku7DjvfgaUaY2NxUr9PS+8 LUL2F07Pk3GD5UCinJkth+2zJa7kxuHsCYjtpeV5W0jPMcQrP+up+3mZz8WpVQ== 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=1725859880; 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=jysb5HR7GRo3yFSdTdQ/Cc/sYoYW1kQh8FpOXQliod8=; b=gJlY/CIytkaSlOARhorSycNY5sfYRb4KfMUVCnFXoOndxMqA9pWM3mein2MaPql5xMfLlq bLYlo5hkxCVGKk39Gh1xsgDjJQ7VM0JKWjvs3iXsDMthC9468FqClgFj7MjlOiZeDOYr6f 4W6PmX0tgfPVfnPK9HQM4HboJvRdcBCY6PZonysflpREV6KNe3xzYG1zZ8EtzIQNgzLjKi sD9Qb/vukDi2PmMUYdiqBSUSSw4MOPK75ddZtgO8REwxCwfK9AlrROtKqkcEdCOHerzGR6 jxaZwT5h9Lg8AGIac9eUtY4ae4jcIL73yUehSvSxvjHuWBbpCKijJohkns75xA== 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 4X2Fn36Tm8zr3j; Mon, 9 Sep 2024 05:31:19 +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 4895VJrp063945; Mon, 9 Sep 2024 05:31:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4895VJF1063942; Mon, 9 Sep 2024 05:31:19 GMT (envelope-from git) Date: Mon, 9 Sep 2024 05:31:19 GMT Message-Id: <202409090531.4895VJF1063942@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: aae763e70ca5 - main - emulators/wine: Update explanation for local patch 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: aae763e70ca585e1152384992aad64c5875fed54 Auto-Submitted: auto-generated The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=aae763e70ca585e1152384992aad64c5875fed54 commit aae763e70ca585e1152384992aad64c5875fed54 Author: Gerald Pfeifer AuthorDate: 2024-09-09 05:28:28 +0000 Commit: Gerald Pfeifer 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