From owner-svn-ports-all@freebsd.org Sat Jul 18 10:46:40 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 45284364498; Sat, 18 Jul 2020 10:46:40 +0000 (UTC) (envelope-from gerald@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 "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4B84Rh17t3z46Jg; Sat, 18 Jul 2020 10:46:40 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0A1239687; Sat, 18 Jul 2020 10:46:40 +0000 (UTC) (envelope-from gerald@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06IAkdMf097291; Sat, 18 Jul 2020 10:46:39 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06IAkdYR097288; Sat, 18 Jul 2020 10:46:39 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202007181046.06IAkdYR097288@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Sat, 18 Jul 2020 10:46:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542489 - in head/emulators/wine-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/emulators/wine-devel: . files X-SVN-Commit-Revision: 542489 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2020 10:46:40 -0000 Author: gerald Date: Sat Jul 18 10:46:38 2020 New Revision: 542489 URL: https://svnweb.freebsd.org/changeset/ports/542489 Log: Update to Wine 5.13. This includes the following changes: - Re-mapping of INI files to the registry. - System call thunks in NTDLL. - Reimplementation of floating point numbers printing. - Beginnings of a restructuration of the console support. - Various bug fixes. A build error got in upstream the day this snapshot was created; temporarily address this via files/patch-dlls-ntdll-unix-registry.c which I alreadly submitted upstream. (The Wine Staging patchset isn't yet available. No change on that front yet - it was marked BROKEN anyway.) Added: head/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c (contents, props changed) Modified: head/emulators/wine-devel/Makefile head/emulators/wine-devel/distinfo head/emulators/wine-devel/pkg-plist Modified: head/emulators/wine-devel/Makefile ============================================================================== --- head/emulators/wine-devel/Makefile Sat Jul 18 10:27:49 2020 (r542488) +++ head/emulators/wine-devel/Makefile Sat Jul 18 10:46:38 2020 (r542489) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 5.12 +DISTVERSION= 5.13 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ Modified: head/emulators/wine-devel/distinfo ============================================================================== --- head/emulators/wine-devel/distinfo Sat Jul 18 10:27:49 2020 (r542488) +++ head/emulators/wine-devel/distinfo Sat Jul 18 10:46:38 2020 (r542489) @@ -1,5 +1,3 @@ -TIMESTAMP = 1593937189 -SHA256 (wine-5.12.tar.xz) = 87f17254c6794ec6eeb7020b164c859983c9df0dacdd66d6449ff000498c842e -SIZE (wine-5.12.tar.xz) = 23939672 -SHA256 (v5.12.tar.gz) = 65d710eb309f9a240d5c406e13f37470e363917e2292f095c6c7ed030aa9d592 -SIZE (v5.12.tar.gz) = 9834148 +TIMESTAMP = 1595061543 +SHA256 (wine-5.13.tar.xz) = c46a5c1c2aaf41993de5a5e78b7780060e0e77066531d0ca672ae08e325e0152 +SIZE (wine-5.13.tar.xz) = 23955832 Added: head/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c Sat Jul 18 10:46:38 2020 (r542489) @@ -0,0 +1,42 @@ +From: Gerald Pfeifer +To: wine-devel@winehq.org +Date: Sat, 18 Jul 2020 12:02:58 +0300 (EEST) +Subject: [PATCH] ntdll: Include for sigset_t + +commit 7053b7c615b44e7112ab8fb4c056206d32b6f1c9 +Author: Alexandre Julliard +Date: Fri Jul 17 11:46:15 2020 +0200 + + ntdll: Move the registry system calls to the Unix library. + + Signed-off-by: Alexandre Julliard + +broke non-Linux platforms since sigset_t isn't necessarily defined +based on the #include statements in the new dlls/ntdll/unix/registry.c. + +This fixes it. + +Observed and tested on FreeBSD 11.4/i386. + +Gerald + +Signed-off-by: Gerald Pfeifer +--- + dlls/ntdll/unix/registry.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/dlls/ntdll/unix/registry.c b/dlls/ntdll/unix/registry.c +index f94c8ff98e..6d58361818 100644 +--- dlls/ntdll/unix/registry.c ++++ dlls/ntdll/unix/registry.c +@@ -25,6 +25,7 @@ + #pragma makedep unix + #endif + ++#include + #include + #include + +-- +2.27.0 + Modified: head/emulators/wine-devel/pkg-plist ============================================================================== --- head/emulators/wine-devel/pkg-plist Sat Jul 18 10:27:49 2020 (r542488) +++ head/emulators/wine-devel/pkg-plist Sat Jul 18 10:46:38 2020 (r542489) @@ -1187,6 +1187,7 @@ lib/wine/api-ms-win-core-synch-l1-2-1.dll.so lib/wine/api-ms-win-core-sysinfo-l1-1-0.dll.so lib/wine/api-ms-win-core-sysinfo-l1-2-0.dll.so lib/wine/api-ms-win-core-sysinfo-l1-2-1.dll.so +lib/wine/api-ms-win-core-systemtopology-l1-1-0.dll.so lib/wine/api-ms-win-core-threadpool-l1-1-0.dll.so lib/wine/api-ms-win-core-threadpool-l1-2-0.dll.so lib/wine/api-ms-win-core-threadpool-legacy-l1-1-0.dll.so @@ -1648,6 +1649,7 @@ lib/wine/fakedlls/api-ms-win-core-synch-l1-2-1.dll lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-0.dll lib/wine/fakedlls/api-ms-win-core-sysinfo-l1-2-1.dll +lib/wine/fakedlls/api-ms-win-core-systemtopology-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-threadpool-l1-1-0.dll lib/wine/fakedlls/api-ms-win-core-threadpool-l1-2-0.dll lib/wine/fakedlls/api-ms-win-core-threadpool-legacy-l1-1-0.dll