proton-tkg-additions: rebase patch, rename older version and update s…

…cript (#1260) Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Frogging-Family · Sep 18, 2024 · 9739a24 · 9739a24
1 parent b6afdc7
commit 9739a24
Show file tree

Hide file tree

Showing 3 changed files with 458 additions and 5 deletions.
diff --git a/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton-tkg/proton-tkg b/wine-tkg-git/wine-tkg-patches/proton-tkg-specific/proton-tkg/proton-tkg
@@ -535,9 +535,11 @@
 	      fi
 	    fi
 	  fi
-	  if [ "$_proton_fs_hack" != "true" ] && [ "$_wayland_driver" != "true" ] && [ "$_use_staging" = "true" ] && [ "$_childwindow_fix" = "true" ] && git merge-base --is-ancestor 3ded60bd1654dc689d24a23305f4a93acce3a6f2 HEAD; then
-	    if git merge-base --is-ancestor cb1c03b926ca01619be02f835f382c1dd7d4a478 HEAD; then
+	  if [ "$_proton_fs_hack" != "true" ] && [ "$_wayland_driver" != "true" ] && [ "$_use_staging" = "true" ] && [ "$_childwindow_fix" = "true" ] || git merge-base --is-ancestor 21a0c158b94bfc65d4baa95095307a1db396db0c HEAD && git merge-base --is-ancestor 3ded60bd1654dc689d24a23305f4a93acce3a6f2 HEAD; then
+	    if git merge-base --is-ancestor e7ab780453920b099724af30c55bf9baf04f8edf HEAD; then
 	      _patchname='proton-tkg-additions.patch' && _patchmsg="Using additional Proton-tkg patches" && nonuser_patcher
+	    elif git merge-base --is-ancestor cb1c03b926ca01619be02f835f382c1dd7d4a478 HEAD; then
+	      _patchname='proton-tkg-additions-e7ab780.patch' && _patchmsg="Using additional Proton-tkg patches" && nonuser_patcher
 	    elif git merge-base --is-ancestor 5d860f62f6cb70a8f3b1b8ca0a9471ab1da56c36 HEAD; then
 	      _patchname='proton-tkg-additions-cb1c03.patch' && _patchmsg="Using additional Proton-tkg patches" && nonuser_patcher
 	    elif git merge-base --is-ancestor 48e6bf3cf1aabdd2ac640f572416b9169e324f21 HEAD; then