From nobody Sat Feb 26 12:41:43 2022 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 6F6C319EE7AA; Sat, 26 Feb 2022 12:41:43 +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 4K5R932l8rz4krY; Sat, 26 Feb 2022 12:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645879303; 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=cAkdKxrvv5RAxxHqf8oHmgjBbYvOqm7zrSaAAQ66zcw=; b=USVJFOag8K45FMtcy4vFHOaVkvZeMlmEiV9OFaFfiyfMf8knBsBDOYjwEz46imZC0riZu+ TvsLItHi0jILtc7ilNefhrtc2/I2pzpU57QFENuJApn/lCp5fMEhk6pJHrVTaPsqL2OFN5 VKpPV9Sw5bo36ABZa5ilvjUtbFoUPTvNUw5OHQ8PlBa7fVIhLr5R5Cn2pb15efieDTNNaj V1uZ/xZxoZWTbLohsEU6EYysJ+7rE3O39gwH6WB8QscaALsZzpeBg3sCfWdN2GQ5HiYuhi wLh01svT0MNQQhMNBB0Qriih0UOT+VHavwBiszu9SLIQy6+ptUENRP/gQSTEhQ== 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 3DCD913C6A; Sat, 26 Feb 2022 12:41:43 +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 21QCfheH077456; Sat, 26 Feb 2022 12:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21QCfhv4077455; Sat, 26 Feb 2022 12:41:43 GMT (envelope-from git) Date: Sat, 26 Feb 2022 12:41:43 GMT Message-Id: <202202261241.21QCfhv4077455@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: 1e975ef8d979 - main - emulators/wine: Update to Wine 6.0.3 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 1e975ef8d979977148a03a3daf230cc7404bdb48 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645879303; 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=cAkdKxrvv5RAxxHqf8oHmgjBbYvOqm7zrSaAAQ66zcw=; b=widWuIJ3hzBpaiJYDS2EIaBdCmp4qOIu6IW+avlMIxRcTQ/A9Iknes2DGQSH5vWQ1ANBYA sDOiI81MBFsYZccrGfI5SRX9Rd/ba3uKPY0hbot18VUdD1L6pyR7UnpWojBCopCFyx2uXh ki5fC+L+CG3CKyLsJ3TOvTIFY94kw/LZTtgXmnSdZ2syMLVpPPNrJbBeibarVk/0T0kmjP R+F2LQkPjK535cJ1m8bZ/vTT6tj37F1guqgIWw4kKboPmn3MsR3zm4Wg/fxCnldN90znsM dGOOsmy4rlqcEr5P7EFdnE9iKLml9aYF8F3BXJhKSJbfqzzzW04cvBI/qbOuVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645879303; a=rsa-sha256; cv=none; b=nC9FYjjkcxyrllbhS0lkZK8GA18E6E1AFCadv4k/9tSXDZU+zSMBnhUsbYLlfWym7xOxJE b7N5QDEhKf2Bpjd3cadf+U/HR/XvOf3DGBp1I5P1nBAgx4266K55eUuxZnKTz95gD57+FZ 7prWOmWPKK5lAWRLT9x9ksTpZGF+1ftDTs5tMdTpwmEWw9stcEZsNTD9C9/BJ9NnzLv/aR PCgQawYzTYE6NiYEyKHgfKXf8rI5fa0AI9DDRozzXgO2fB6YimPNt931hC4G9vKFmcasbS OKNQPbPs2tOzpMH2y7fs0Rbf990XFqdDToMh6D/oWw9ls6jkujg9Akm4jtcMjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e975ef8d979977148a03a3daf230cc7404bdb48 commit 1e975ef8d979977148a03a3daf230cc7404bdb48 Author: Gerald Pfeifer AuthorDate: 2022-02-26 12:23:32 +0000 Commit: Gerald Pfeifer CommitDate: 2022-02-26 12:41:32 +0000 emulators/wine: Update to Wine 6.0.3 This minor release fixes 46 bugs. It also includes my upstream work which I had backported as files/patch-sysinfo, so we can remove that local change. --- emulators/wine/Makefile | 3 +- emulators/wine/distinfo | 6 ++-- emulators/wine/files/patch-sysinfo | 72 -------------------------------------- 3 files changed, 4 insertions(+), 77 deletions(-) diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile index ae5fb377d3ee..bcc954cfc582 100644 --- a/emulators/wine/Makefile +++ b/emulators/wine/Makefile @@ -1,8 +1,7 @@ # Created by: Gerald Pfeifer PORTNAME= wine -DISTVERSION= 6.0.2 -PORTREVISION= 1 +DISTVERSION= 6.0.3 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine/distinfo b/emulators/wine/distinfo index f2abdb3e4c20..161c0b5c50d8 100644 --- a/emulators/wine/distinfo +++ b/emulators/wine/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1635407149 -SHA256 (wine-6.0.2.tar.xz) = dfe3c58ac785c07220e28f15b62299d76c24d256a67ad9bffd8aefa67b3dbb70 -SIZE (wine-6.0.2.tar.xz) = 24217772 +TIMESTAMP = 1645860418 +SHA256 (wine-6.0.3.tar.xz) = d4fd6e19f97350ea7bdf7fa1fc248ebc59518516f763d0e2fd4c505aa2b0cc1e +SIZE (wine-6.0.3.tar.xz) = 24229680 diff --git a/emulators/wine/files/patch-sysinfo b/emulators/wine/files/patch-sysinfo deleted file mode 100644 index 5021b5c2a045..000000000000 --- a/emulators/wine/files/patch-sysinfo +++ /dev/null @@ -1,72 +0,0 @@ -This is a back port of a patch to mainline Wine; it will be in the -next major version of Wine at which point we need to drop this patch. - -commit 59da79021a6e441e3b21b933c744aba922208ec1 -Author: Gerald Pfeifer -Date: Tue Aug 10 22:36:27 2021 +0200 - - ntdll: Only use sysinfo function when present. - - On some systems may be present while the sysinfo - function may not, or at least not as part of standard libraries, - so check whether the function is actually available before using - it. - - This fixes builds on FreeBSD with the devel/libsysinfo present. - - Signed-off-by: Gerald Pfeifer - Signed-off-by: Alexandre Julliard - ---- UTC -diff --git a/configure b/configure -index 1be0aa9d217..e8c1cb9e3a8 100755 ---- configure -+++ configure -@@ -18068,6 +18068,7 @@ for ac_func in \ - setprogname \ - sigprocmask \ - symlink \ -+ sysinfo \ - tcdrain \ - thr_kill2 - -diff --git a/configure.ac b/configure.ac -index 69e27147088..065b3f231bf 100644 ---- configure.ac -+++ configure.ac -@@ -2205,6 +2205,7 @@ AC_CHECK_FUNCS(\ - setprogname \ - sigprocmask \ - symlink \ -+ sysinfo \ - tcdrain \ - thr_kill2 - ) -diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c -index a252e25fbc6..2cca90ac952 100644 ---- dlls/ntdll/unix/virtual.c -+++ dlls/ntdll/unix/virtual.c -@@ -2737,7 +2737,8 @@ ULONG_PTR get_system_affinity_mask(void) - */ - void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info, BOOL wow64 ) - { --#if defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) -+#if defined(HAVE_SYSINFO) \ -+ && defined(HAVE_STRUCT_SYSINFO_TOTALRAM) && defined(HAVE_STRUCT_SYSINFO_MEM_UNIT) - struct sysinfo sinfo; - - if (!sysinfo(&sinfo)) -diff --git a/include/config.h.in b/include/config.h.in -index ad770281471..24f7b64ffd3 100644 ---- include/config.h.in -+++ include/config.h.in -@@ -744,6 +744,9 @@ - /* Define to 1 if you have the header file. */ - #undef HAVE_SYSCALL_H - -+/* Define to 1 if you have the `sysinfo' function. */ -+#undef HAVE_SYSINFO -+ - /* Define to 1 if you have the - header file. */ - #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H