From feacd0a65fd2c9bfbde07ccc5488a0cadc442dca Mon Sep 17 00:00:00 2001 From: Gerald Pfeifer Date: Sat, 18 Jul 2020 10:46:38 +0000 Subject: [PATCH] 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.) --- emulators/wine-devel/Makefile | 2 +- emulators/wine-devel/distinfo | 8 ++-- .../files/patch-dlls-ntdll-unix-registry.c | 42 +++++++++++++++++++ emulators/wine-devel/pkg-plist | 2 + 4 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 06b2e365909e..06763656fa26 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= wine -DISTVERSION= 5.12 +DISTVERSION= 5.13 PORTEPOCH= 1 CATEGORIES= emulators MASTER_SITES= SF/${PORTNAME}/Source \ diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 494838a7b7b2..82ef234e675a 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -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 diff --git a/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c b/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c new file mode 100644 index 000000000000..b7a0b9cb3975 --- /dev/null +++ b/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c @@ -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 + diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index afeb4a119bd4..12d1c8f8b592 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -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