From nobody Wed Nov 16 08:59:45 2022 X-Original-To: dev-commits-ports-all@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 4NBxnY6Z9Cz4hJGn; Wed, 16 Nov 2022 08:59:45 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NBxnY66rTz3sjh; Wed, 16 Nov 2022 08:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668589185; 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=XOI4TdkkQCD2LR9iZLGgcw6YhBK0dCOvUCBjnHwjNFk=; b=IGKwxSEOYhCdULwCBOkYyqG6kCGrZ/pROTzNVI++e9FfwTpKJueDW/Z8C0MSWVXCllrB8R L9wKs60mWsBJkud5f7x35JLTUTCTTKwq1H24IDEcHZWNXmqUqNbI64SnKRomBEk9h89yow 583/ckJctleVVPP3e7i4qb1oaOtJL1TPjiZK4SnTjV6VE/VCYr/nq0jbRQXeoRx8WPY2W2 rLukUpDZfo2UrtXVBr9q1GnXM1CaxgBIOAmOMtH7eopj4xt3or701mrIoJM45kDFlcWnra GuMBj/dRJyb0/TFElvbp4MVmxOXQG3Ll30tDsCxzZazaFbXgRXzJM9i0or56WQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668589185; 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=XOI4TdkkQCD2LR9iZLGgcw6YhBK0dCOvUCBjnHwjNFk=; b=MB3hJI6QjBnAaY7p7+3lKXCdhUNHonA5l7iY0hab0/+i9G5oc5ElkaB7EVS0L346dfHvTu 36JA6xt9OIGi01OqqGN0tHDN+ChWKUow/YgAAOaSzBJE+7lKrVanD4ofTpfGuYkqK6jKjf LVebsuif1X/w9fqCDWq27YYYKHDa0eHu5O1WbcCpDjWwI5S/cDwySskVTNG/DNxO8I1tO5 RGxlQU8MgadfsvD5AW1a+Ix8pqzmGPkq81RQeu1h62DwDVZpbLdjXWwSXtJCLyGIsgRt44 be4N/izzUa6T+j4AmTTAfaAWdbr1wept9doFe5ZpQeRydT7UsX7rLk3CEsKHcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668589185; a=rsa-sha256; cv=none; b=LLzIo30fIy5102siFoge6fr8Mf1iyuuikLkExDtjAqylm4SuwGPUgcNmFYFVuWd+k0FoPN ntzvxN0Z5XQcRXawl5ZNTmFRqg1mxS09RsBzAe+uADiMzt74S/EJO4ejCuqjzRO6vXyJ/H FSqNHWG7r/kaNX4KdZ10Ha/sqaEdJp45nrJ6S+UtR1ag7CFfprIQxZlr63MYtbjEoVBP4y fZY4HZB5xxnZ9hjKErmLny508KKY1i2EBCq+qVWQ0mAPMjzPcrbvV1U0itZgyHfvlosz3U s8BSeM/RuaigfONMKaRM8rMPSKvekUIRFTyH6HVGUkj7Sy4s+NtIY7vAG4OYNA== 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 4NBxnY55wvzw0w; Wed, 16 Nov 2022 08:59:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2AG8xjJK024528; Wed, 16 Nov 2022 08:59:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AG8xjJH024527; Wed, 16 Nov 2022 08:59:45 GMT (envelope-from git) Date: Wed, 16 Nov 2022 08:59:45 GMT Message-Id: <202211160859.2AG8xjJH024527@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: aeaeb81611c8 - main - emulators/wine-devel: update to Wine 7.20 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: aeaeb81611c8ae553ab3ca3dece0c857b5746051 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=aeaeb81611c8ae553ab3ca3dece0c857b5746051 commit aeaeb81611c8ae553ab3ca3dece0c857b5746051 Author: Damjan Jovanovic AuthorDate: 2022-11-16 08:59:10 +0000 Commit: Gerald Pfeifer CommitDate: 2022-11-16 08:59:10 +0000 emulators/wine-devel: update to Wine 7.20 This includes the following changes: - Font linking improvements. - A number of fixes for exception unwinding. - Support for dumping EMF spool files in WineDump. - Various bug fixes. files/patch-dlls-ntdll-unix-file.c has been merged upstream; drop it. --- emulators/wine-devel/Makefile | 2 +- emulators/wine-devel/distinfo | 10 ++--- .../wine-devel/files/patch-dlls-ntdll-unix-file.c | 49 ---------------------- emulators/wine-devel/pkg-plist | 1 + 4 files changed, 7 insertions(+), 55 deletions(-) diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index dac92e814d72..02538d4ec65b 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -1,5 +1,5 @@ PORTNAME= wine -DISTVERSION= 7.19 +DISTVERSION= 7.20 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= https://dl.winehq.org/wine/source/7.x/ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index f6c2aa68d70f..b5d7d63de6d2 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1666968876 -SHA256 (wine-7.19.tar.xz) = 43ac497e6e1d7fded492c32a68b554c57b76f2be8dc787e7335a0dd4e68b9d21 -SIZE (wine-7.19.tar.xz) = 28502612 -SHA256 (v7.19.tar.gz) = 83347f27a77685f6c4b08a171a432254d93f797b1a9457276bba2ddd21c60840 -SIZE (v7.19.tar.gz) = 9523048 +TIMESTAMP = 1667271216 +SHA256 (wine-7.20.tar.xz) = 751b79f22b5a9f72c9ec15f755b00b13d3ed073e9168c3ef4adabd9db37d0d50 +SIZE (wine-7.20.tar.xz) = 28534920 +SHA256 (v7.20.tar.gz) = d3210cf8e8c75c7dba63dce9af014fae2664078c00baaff85eb878df81e421ed +SIZE (v7.20.tar.gz) = 9521481 diff --git a/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c b/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c deleted file mode 100644 index 4bb1325af847..000000000000 --- a/emulators/wine-devel/files/patch-dlls-ntdll-unix-file.c +++ /dev/null @@ -1,49 +0,0 @@ -commit d7541508936b9ed776e8a39a0bc2a4cc875514d3 -Author: Gerald Pfeifer -Date: Tue Oct 18 23:41:49 2022 +0200 - - ntdll: Fix build on systems without ENODATA. - - On FreeBSD 12 and 14 ENODATA is not regularly defined. Cater to that - in fd_get_file_info() and get_file_info(). - -diff --git dlls/ntdll/unix/file.c dlls/ntdll/unix/file.c -index c7ba12a5c13..8a599a289f8 100644 ---- dlls/ntdll/unix/file.c -+++ dlls/ntdll/unix/file.c -@@ -1565,10 +1565,15 @@ static int fd_get_file_info( int fd, unsigned int options, struct stat *st, ULON - attr_len = xattr_fget( fd, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); - if (attr_len != -1) - *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); -- else if (errno != ENODATA && errno != ENOTSUP) -+ else -+ { -+ if (errno == ENOTSUP) return ret; -+#ifdef ENODATA -+ if (errno == ENODATA) return ret; -+#endif - WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB ". errno %d (%s)\n", - errno, strerror( errno ) ); -- -+ } - return ret; - } - -@@ -1653,10 +1658,15 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr ) - attr_len = xattr_get( path, SAMBA_XATTR_DOS_ATTRIB, attr_data, sizeof(attr_data)-1 ); - if (attr_len != -1) - *attr |= parse_samba_dos_attrib_data( attr_data, attr_len ); -- else if (errno != ENODATA && errno != ENOTSUP) -+ else -+ { -+ if (errno == ENOTSUP) return ret; -+#ifdef ENODATA -+ if (errno == ENODATA) return ret; -+#endif - WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n", - path, errno, strerror( errno ) ); -- -+ } - return ret; - } - diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 05ee476fc93c..cefb49c6b102 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -595,6 +595,7 @@ include/wine/windows/mediaobj.h include/wine/windows/mediaobj.idl include/wine/windows/medparam.h include/wine/windows/medparam.idl +include/wine/windows/memoryapi.h include/wine/windows/metahost.h include/wine/windows/metahost.idl include/wine/windows/mfapi.h