More Proton 9 fixes

Frogging-Family · Mar 2, 2024 · e6fd6bb · e6fd6bb
1 parent ec98135
commit e6fd6bb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/wine-tkg-git/wine-tkg-patches/hotfixes/earlyhotfixer b/wine-tkg-git/wine-tkg-patches/hotfixes/earlyhotfixer
@@ -281,7 +281,7 @@ EOM
 
     # Disable problematic syscall emulation patchset in semi-recent trees that enable it (for new-style WoW64 builds)
     # This workarounds the "Internal error" message when running a 32-bit program in the new-style WoW64 mode
-    if ( cd "${srcdir}"/"${_stgsrcdir}" && git merge-base --is-ancestor 2e9f238732289907b4f07335d826ac3e7882f5ba HEAD && [ -e "${srcdir}/${_stgsrcdir}/patches/ntdll-Syscall_Emulation/definition" ] && ! grep -Fxq 'Disabled: True' "${srcdir}/${_stgsrcdir}/patches/ntdll-Syscall_Emulation/definition" ) && [ "${_NOLIB32}" = "wow64" ]; then
+    if [ "$_unfrog" != "true" ] && ( cd "${srcdir}"/"${_stgsrcdir}" && git merge-base --is-ancestor 2e9f238732289907b4f07335d826ac3e7882f5ba HEAD && [ -e "${srcdir}/${_stgsrcdir}/patches/ntdll-Syscall_Emulation/definition" ] && ! grep -Fxq 'Disabled: True' "${srcdir}/${_stgsrcdir}/patches/ntdll-Syscall_Emulation/definition" ) && [ "${_NOLIB32}" = "wow64" ]; then
       warning "Disable ntdll-Syscall_Emulation patchset for WoW64 builds (on staging 2e9f2387+)"
       _staging_args+=(-W ntdll-Syscall_Emulation)
     fi

diff --git a/wine-tkg-git/wine-tkg-patches/hotfixes/valve/hotfixes b/wine-tkg-git/wine-tkg-patches/hotfixes/valve/hotfixes
@@ -2,13 +2,13 @@
 
 # When not building proton, get rid of steam-specific patches
 if [ "$_EXTERNAL_INSTALL" != "proton" ]; then
-  if [[ "$_plain_version" != *_8.0 ]]; then
+  if [[ "$_plain_version" = *_7.0 ]]; then
     if [[ "$_LOCAL_PRESET" = valve-ex* ]]; then
       cp "$_where"/wine-tkg-patches/hotfixes/valve/de-steamify-be.mypatch "$_where"/
     else
       cp "$_where"/wine-tkg-patches/hotfixes/valve/de-steamify.mypatch "$_where"/
     fi
-  else
+  elif [[ "$_plain_version" = *_8.0 ]]; then
     if [ "$_LOCAL_PRESET" = "valve" ]; then
       cp "$_where"/wine-tkg-patches/hotfixes/valve/de-steamify-80.mypatch "$_where"/
     elif [ "$_LOCAL_PRESET" = "valve-exp" ]; then
@@ -28,7 +28,7 @@ if [ "$_steamclient_noswap" = "true" ]; then
 fi
 
 if [ "$_use_staging" = "true" ]; then
-    if [ "$_LOCAL_PRESET" = "valve-exp-bleeding" ] && [[ "$_plain_version" != *_8.0 ]]; then
+    if [ "$_LOCAL_PRESET" = "valve-exp-bleeding" ] && [[ "$_plain_version" = *_7.0 ]]; then
       ( cd "${srcdir}/$_stgsrcdir" && patch -Np1 < "$_where"/wine-tkg-patches/hotfixes/valve/fixes/cryptext-CryptExtOpenCER/Rebase_against_be5d60d949c470d8039649ee1f7488a59a1c31bc.patch >> "$_where"/prepare.log )
     fi