From 250e8393ac2436d5a0d57b1b90ccd90474871503 Mon Sep 17 00:00:00 2001 From: Anthony Eadicicco Date: Sat, 9 Jan 2021 14:53:24 -0500 Subject: [PATCH] wine: Add wine-staging patchset as a (non-default) build option closes #27612 --- srcpkgs/wine/template | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/srcpkgs/wine/template b/srcpkgs/wine/template index be0981ca546..588cbb8c80c 100644 --- a/srcpkgs/wine/template +++ b/srcpkgs/wine/template @@ -1,20 +1,24 @@ # Template file for 'wine' pkgname=wine version=6.0rc6 -revision=1 -wrksrc=wine-${version/r/-r} +revision=2 +create_wrksrc=yes +build_wrksrc=wine-${version/r/-r} build_style=gnu-configure configure_args="--bindir=/usr/libexec/wine" short_desc="Run Microsoft Windows applications" maintainer="Helmut Pozimski " license="LGPL-2.1-or-later" homepage="http://www.winehq.org/" -distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz" -checksum=e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1 +distfiles="https://dl.winehq.org/wine/source/${version%r*}/wine-${version/r/-r}.tar.xz + $(vopt_if staging "https://github.com/wine-staging/wine-staging/archive/v${version/r/-r}.tar.gz")" +checksum="e67a97f198c96b3a624b637902be39be68c6dc5540d5594513078cf89780e6c1 + $(vopt_if staging "9ee8a6d9eefae3bca4a6550d5336edac96537e5da0c3669003d21f08b55cbd13")" -build_options="mingw" +build_options="mingw staging" build_options_default="mingw" desc_option_mingw="Use the MinGW cross compiler to build WinPE DLLs" +desc_option_staging="Apply the wine-staging patchset" lib32mode=full archs="i686* x86_64*" @@ -28,7 +32,8 @@ if [ "$XBPS_TARGET_MACHINE" = i686-musl ]; then fi hostmakedepends="pkg-config flex gettext - $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32")" + $(vopt_if mingw "cross-${XBPS_TARGET_MACHINE%-musl}-w64-mingw32") + $(vopt_if staging 'autoconf')" makedepends="gettext-devel lcms2-devel zlib-devel ncurses-devel glu-devel libSM-devel libXext-devel libX11-devel libXpm-devel libXinerama-devel libXcomposite-devel libXmu-devel libXxf86vm-devel @@ -64,6 +69,12 @@ if [ "${_nopie}" = yes ]; then nopie_files+=" ${_wine_libexec}/wineserver${_wineserver_suffix}" fi +post_patch() { + if [ "${build_option_staging}" ]; then + "../wine-staging-${version/r/-r}/patches/patchinstall.sh" --all + fi +} + pre_build() { if [ "${_nopie}" = yes ]; then make ${makejobs} LDFLAGS="$LDFLAGS -no-pie" \