Date: Sat, 26 Feb 2022 12:41:43 GMT From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1e975ef8d979 - main - emulators/wine: Update to Wine 6.0.3 Message-ID: <202202261241.21QCfhv4077455@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by gerald: URL: https://cgit.FreeBSD.org/ports/commit/?id=1e975ef8d979977148a03a3daf230cc7404bdb48 commit 1e975ef8d979977148a03a3daf230cc7404bdb48 Author: Gerald Pfeifer <gerald@FreeBSD.org> AuthorDate: 2022-02-26 12:23:32 +0000 Commit: Gerald Pfeifer <gerald@FreeBSD.org> 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 <gerald@FreeBSD.org> 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 <gerald@pfeifer.com> -Date: Tue Aug 10 22:36:27 2021 +0200 - - ntdll: Only use sysinfo function when present. - - On some systems <sys/sysinfo.h> 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 <gerald@pfeifer.com> - Signed-off-by: Alexandre Julliard <julliard@winehq.org> - ---- 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 <syscall.h> 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 - <SystemConfiguration/SCDynamicStoreCopyDHCPInfo.h> header file. */ - #undef HAVE_SYSTEMCONFIGURATION_SCDYNAMICSTORECOPYDHCPINFO_H
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202202261241.21QCfhv4077455>