Date: Friday, October 6, 2017 @ 03:38:37 Author: lcarlier Revision: 261810
upgpkg: wine-staging-nine 2.18-1 upstream update 2.18 Added: wine-staging-nine/trunk/steam.patch Modified: wine-staging-nine/trunk/PKGBUILD -------------+ PKGBUILD | 17 ++++++++++++----- steam.patch | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 51 insertions(+), 5 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2017-10-06 02:40:33 UTC (rev 261809) +++ PKGBUILD 2017-10-06 03:38:37 UTC (rev 261810) @@ -7,7 +7,7 @@ # Contributor: Giovanni Scafora <giova...@archlinux.org> pkgname=wine-staging-nine -pkgver=2.16 +pkgver=2.18 pkgrel=1 _pkgbasever=${pkgver/rc/-rc} @@ -15,10 +15,12 @@ source=("https://github.com/wine-compholio/wine-patched/archive/staging-$_pkgbasever.tar.gz" "https://github.com/sarnex/wine-d3d9-patches/archive/wine-d3d9-$_ninepatchver.tar.gz" - 30-win32-aliases.conf) -sha512sums=('f375c74b3c5fd2a0d46de0e4f371c1fe58059da776851e4f9854d288b0d9a97bd9c5432fdd713d0bfdb77b7d6a43a8d7c1c8ae5adc29d637ab30b87788de336f' - 'f3950d7e34ec537b95b963fb3b35ee3729c1b3f9d8c225e96ae9ab9cf8011571ba22105a17309c481f3a504a8aa4d5ae04270691c49098924aa2f72463b79e08' - '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb') + 30-win32-aliases.conf + steam.patch) +sha512sums=('13a1d76b496774dfa2f9d59379a1074e77f56cc480e9862069428bcac0d4ab6221e39099f14c4a3ba3eb64e01f9eab75b2020b21a36398cff37ebe7dec6f90f7' + '0e66c51e1957b27ccb9f326b0aaf2b0d09b7bbc9d03e1d321aa1789d2560b8e60fd83c4e86999d96a03aa73a37c96f34d93245763969a314150900741aa03933' + '6e54ece7ec7022b3c9d94ad64bdf1017338da16c618966e8baf398e6f18f80f7b0576edf1d1da47ed77b96d577e4cbb2bb0156b0b11c183a0accf22654b0a2bb' + 'f3e42a0720777256ca583f96044f6482aae8f4c707189104216f86f6c7a1b68a186c5124c72866229d46eb66c20c555ba9f32a230ec50f968faa8a12b8372b0a') pkgdesc="A compatibility layer for running Windows programs - Staging branch with the gallium-nine patches" url="http://www.wine-staging.com" @@ -121,6 +123,11 @@ sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i $pkgname/configure* + # steam fix + #pushd $pkgname + #patch -Np1 -i ../steam.patch + #popd + # Apply the nine patchset pushd $pkgname patch -Np1 -i ../wine-d3d9-patches-wine-d3d9-${_ninepatchver}/staging-helper.patch Added: steam.patch =================================================================== --- steam.patch (rev 0) +++ steam.patch 2017-10-06 03:38:37 UTC (rev 261810) @@ -0,0 +1,39 @@ +diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c +index 6e7b23e..63eda34 100644 +--- a/dlls/kernel32/process.c ++++ b/dlls/kernel32/process.c +@@ -2429,6 +2429,33 @@ static BOOL create_process_impl( LPCWSTR app_name, LPWSTR cmd_line, LPSECURITY_A + return FALSE; + if (hFile == INVALID_HANDLE_VALUE) goto done; + ++ /* CROSSOVER HACK: bug 13322 (winehq bug 39403) ++ * Insert --no-sandbox in command line of Steam's web helper process to ++ * work around problems hooking our ntdll exports. */ ++ { ++ static const WCHAR steamwebhelperexeW[] = {'s','t','e','a','m','w','e','b','h','e','l','p','e','r','.','e','x','e',0}; ++ static const WCHAR nosandboxW[] = {' ','-','-','n','o','-','s','a','n','d','b','o','x',0}; ++ ++ if (strstrW(name, steamwebhelperexeW)) ++ { ++ LPWSTR new_command_line; ++ ++ new_command_line = HeapAlloc(GetProcessHeap(), 0, ++ sizeof(WCHAR) * (strlenW(tidy_cmdline) + strlenW(nosandboxW) + 1)); ++ ++ if (!new_command_line) return FALSE; ++ ++ strcpyW(new_command_line, tidy_cmdline); ++ strcatW(new_command_line, nosandboxW); ++ ++ TRACE("CrossOver hack changing command line to %s\n", debugstr_w(new_command_line)); ++ ++ if (tidy_cmdline != cmd_line) HeapFree( GetProcessHeap(), 0, tidy_cmdline ); ++ tidy_cmdline = new_command_line; ++ } ++ } ++ /* end CROSSOVER HACK */ ++ + /* Warn if unsupported features are used */ + + if (flags & (IDLE_PRIORITY_CLASS | HIGH_PRIORITY_CLASS | REALTIME_PRIORITY_CLASS | +