Date: Wed, 22 Jul 2020 10:41:53 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542851 - in head/emulators/wine-devel: . files Message-ID: <202007221041.06MAfrTS077816@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Wed Jul 22 10:41:53 2020 New Revision: 542851 URL: https://svnweb.freebsd.org/changeset/ports/542851 Log: The Wine Staging patchset for Wine 5.13 is now available and fixed (compared to the previous one). It also addresses the build issue for Wine 5.13 that I fixed via files/patch-dlls-ntdll-unix-registry.c, so we need to make that patch only apply when the Wine Staging patchset is not used. PR: 248118 Submitted by: vvd@unislabs.com Added: head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c - copied unchanged from r542850, head/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c Deleted: head/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c 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 Wed Jul 22 10:24:52 2020 (r542850) +++ head/emulators/wine-devel/Makefile Wed Jul 22 10:41:53 2020 (r542851) @@ -102,7 +102,6 @@ MPG123_LIB_DEPENDS= libmpg123.so:audio/mpg123 OPENAL_CONFIGURE_WITH= openal OPENAL_USES= openal -STAGING_BROKEN= fails to build STAGING_MASTER_SITES= https://github.com/wine-staging/wine-staging/archive/:staging STAGING_DIST= v${DISTVERSION}.tar.gz STAGING_DISTFILES= ${STAGING_DIST}:staging @@ -135,6 +134,10 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig # i386-wine-devel slave port. .ifndef WINE_SLAVE_BUILD .include <bsd.port.pre.mk> +.endif + +.if !${PORT_OPTIONS:MSTAGING} +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-dlls-ntdll-unix-registry.c .endif .if ${ARCH} == amd64 Modified: head/emulators/wine-devel/distinfo ============================================================================== --- head/emulators/wine-devel/distinfo Wed Jul 22 10:24:52 2020 (r542850) +++ head/emulators/wine-devel/distinfo Wed Jul 22 10:41:53 2020 (r542851) @@ -1,3 +1,5 @@ -TIMESTAMP = 1595061543 +TIMESTAMP = 1595332764 SHA256 (wine-5.13.tar.xz) = c46a5c1c2aaf41993de5a5e78b7780060e0e77066531d0ca672ae08e325e0152 SIZE (wine-5.13.tar.xz) = 23955832 +SHA256 (v5.13.tar.gz) = 395c047d993cf8809727abecadacf2851f078d1f0e68d622a6e6c5284717cb68 +SIZE (v5.13.tar.gz) = 9807468 Copied: head/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c (from r542850, 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/extrapatch-dlls-ntdll-unix-registry.c Wed Jul 22 10:41:53 2020 (r542851, copy of r542850, head/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c) @@ -0,0 +1,42 @@ +From: Gerald Pfeifer <gerald@pfeifer.com> +To: wine-devel@winehq.org +Date: Sat, 18 Jul 2020 12:02:58 +0300 (EEST) +Subject: [PATCH] ntdll: Include <signal.h> for sigset_t + +commit 7053b7c615b44e7112ab8fb4c056206d32b6f1c9 +Author: Alexandre Julliard <julliard@winehq.org> +Date: Fri Jul 17 11:46:15 2020 +0200 + + ntdll: Move the registry system calls to the Unix library. + + Signed-off-by: Alexandre Julliard <julliard@winehq.org> + +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 <gerald@pfeifer.com> +--- + 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 <signal.h> + #include <stdarg.h> + #include <string.h> + +-- +2.27.0 + Modified: head/emulators/wine-devel/pkg-plist ============================================================================== --- head/emulators/wine-devel/pkg-plist Wed Jul 22 10:24:52 2020 (r542850) +++ head/emulators/wine-devel/pkg-plist Wed Jul 22 10:41:53 2020 (r542851) @@ -1014,7 +1014,6 @@ include/wine/windows/wuapi.h include/wine/windows/wuapi.idl include/wine/windows/x3daudio.h include/wine/windows/xact3.h -%%STAGING%%include/wine/windows/xact3.idl include/wine/windows/xact3wb.h include/wine/windows/xapo.h include/wine/windows/xapo.idl
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007221041.06MAfrTS077816>