diff options
| author | Gerald Pfeifer <gerald@FreeBSD.org> | 2020-07-22 10:41:53 +0000 |
|---|---|---|
| committer | Gerald Pfeifer <gerald@FreeBSD.org> | 2020-07-22 10:41:53 +0000 |
| commit | c3e4e7a1db78639ef9dc9519838e305b1cf61ca4 (patch) | |
| tree | 740065793c7f23688835c970a175fc91607ddc59 /emulators/wine-devel | |
| parent | d8fbd498ddd4301513be0fad801bbb88dd43e1f4 (diff) | |
| download | ports-c3e4e7a1db78639ef9dc9519838e305b1cf61ca4.tar.gz ports-c3e4e7a1db78639ef9dc9519838e305b1cf61ca4.zip | |
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
Notes
Notes:
svn path=/head/; revision=542851
Diffstat (limited to 'emulators/wine-devel')
| -rw-r--r-- | emulators/wine-devel/Makefile | 5 | ||||
| -rw-r--r-- | emulators/wine-devel/distinfo | 4 | ||||
| -rw-r--r-- | emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c (renamed from emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c) | 0 | ||||
| -rw-r--r-- | emulators/wine-devel/pkg-plist | 1 |
4 files changed, 7 insertions, 3 deletions
diff --git a/emulators/wine-devel/Makefile b/emulators/wine-devel/Makefile index 06763656fa26..1bd58ad1826c 100644 --- a/emulators/wine-devel/Makefile +++ b/emulators/wine-devel/Makefile @@ -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 @@ -137,6 +136,10 @@ X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ .include <bsd.port.pre.mk> .endif +.if !${PORT_OPTIONS:MSTAGING} +EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-dlls-ntdll-unix-registry.c +.endif + .if ${ARCH} == amd64 # Wine is composed of three parts: # - wine (aka this port) is the 32-bit component and runs 32-bit programs (on FreeBSD/i386) diff --git a/emulators/wine-devel/distinfo b/emulators/wine-devel/distinfo index 82ef234e675a..22822145d29c 100644 --- a/emulators/wine-devel/distinfo +++ b/emulators/wine-devel/distinfo @@ -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 diff --git a/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c b/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c index b7a0b9cb3975..b7a0b9cb3975 100644 --- a/emulators/wine-devel/files/patch-dlls-ntdll-unix-registry.c +++ b/emulators/wine-devel/files/extrapatch-dlls-ntdll-unix-registry.c diff --git a/emulators/wine-devel/pkg-plist b/emulators/wine-devel/pkg-plist index 12d1c8f8b592..6276737ccbbd 100644 --- a/emulators/wine-devel/pkg-plist +++ b/emulators/wine-devel/pkg-plist @@ -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 |