diff options
| -rw-r--r-- | system/wine-staging/steam.patch | 38 | ||||
| -rw-r--r-- | system/wine-staging/wine-staging.SlackBuild | 6 | ||||
| -rw-r--r-- | system/wine-staging/wine-staging.info | 10 |
3 files changed, 6 insertions, 48 deletions
diff --git a/system/wine-staging/steam.patch b/system/wine-staging/steam.patch deleted file mode 100644 index deef1b5cd8..0000000000 --- a/system/wine-staging/steam.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 | diff --git a/system/wine-staging/wine-staging.SlackBuild b/system/wine-staging/wine-staging.SlackBuild index a6c06c738c..b92c4a6ec4 100644 --- a/system/wine-staging/wine-staging.SlackBuild +++ b/system/wine-staging/wine-staging.SlackBuild @@ -30,7 +30,7 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. PRGNAM=wine-staging -VERSION=${VERSION:-4.19} +VERSION=${VERSION:-4.21} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -123,10 +123,6 @@ patch -p1 --verbose < $CWD/0001-winhlp32-Workaround-a-bug-in-Flex.patch # fix path of opencl headers. sed 's|OpenCL/opencl.h|CL/opencl.h|g' -i configure* -# Steam crossover hack for store/web functionality. -# https://bugs.winehq.org/show_bug.cgi?id=39403 -patch -Np1 < $CWD/steam.patch - # Remove -fPIC for i?86 or the build will hang. if [ "$ARCH" == "i?86" ]; then patch -p1 --verbose < $CWD/x86_remove_fpic.patch diff --git a/system/wine-staging/wine-staging.info b/system/wine-staging/wine-staging.info index 7e59abb875..46c3cd7d08 100644 --- a/system/wine-staging/wine-staging.info +++ b/system/wine-staging/wine-staging.info @@ -1,10 +1,10 @@ PRGNAM="wine-staging" -VERSION="4.19" +VERSION="4.21" HOMEPAGE="https://wiki.winehq.org/Wine-Staging" -DOWNLOAD="https://dl.winehq.org/wine/source/4.x/wine-4.19.tar.xz \ - https://github.com/wine-staging/wine-staging/archive/v4.19/wine-staging-4.19.tar.gz" -MD5SUM="2932e49e47853840b653189022e000bd \ - 56d48866edb35276cfa42c5505c905b7" +DOWNLOAD="https://dl.winehq.org/wine/source/4.x/wine-4.21.tar.xz \ + https://github.com/wine-staging/wine-staging/archive/v4.21/wine-staging-4.21.tar.gz" +MD5SUM="8c0b7b7f16c9fcbad663a35903b4613b \ + c253c253bdfb5ece6b7889bb642894a7" DOWNLOAD_x86_64="UNSUPPORTED" MD5SUM_x86_64="" REQUIRES="" |