From owner-svn-ports-head@freebsd.org Wed Jul 22 10:41:54 2020 Return-Path: Delivered-To: svn-ports-head@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 8E84B378C14; Wed, 22 Jul 2020 10:41:54 +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 4BBX8L2RBGz41dr; Wed, 22 Jul 2020 10:41:54 +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 36E432E268; Wed, 22 Jul 2020 10:41:54 +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 06MAfs5X077821; Wed, 22 Jul 2020 10:41:54 GMT (envelope-from gerald@FreeBSD.org) Received: (from gerald@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06MAfrTS077816; Wed, 22 Jul 2020 10:41:53 GMT (envelope-from gerald@FreeBSD.org) Message-Id: <202007221041.06MAfrTS077816@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gerald set sender to gerald@FreeBSD.org using -f From: Gerald Pfeifer Date: Wed, 22 Jul 2020 10:41:53 +0000 (UTC) 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 X-SVN-Group: ports-head X-SVN-Commit-Author: gerald X-SVN-Commit-Paths: in head/emulators/wine-devel: . files X-SVN-Commit-Revision: 542851 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 22 Jul 2020 10:41:54 -0000 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 +.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 +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 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