childwindow-proton: Skip patch because upstream merged support for ch…

…ild window (#1257) Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
Frogging-Family · Sep 14, 2024 · be8d600 · be8d600
1 parent 1ad2068
commit be8d600
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton b/wine-tkg-git/wine-tkg-patches/misc/childwindow/childwindow-proton
@@ -2,7 +2,9 @@
 
 	# Standalone child window support for vk - Fixes World of Final Fantasy and others - https://bugs.winehq.org/show_bug.cgi?id=45277 - legacy patchset for older trees applied at an earlier stage in the script
 	if ( [ "$_childwindow_fix" = "true" ] && [ "$_proton_fs_hack" != "true" ] && [ "$_use_staging" = "true" ] ); then
-	  if git merge-base --is-ancestor cb1c03b926ca01619be02f835f382c1dd7d4a478 HEAD; then
+	  if git merge-base --is-ancestor 21a0c158b94bfc65d4baa95095307a1db396db0c HEAD; then
+	    warning "Child window support have been merged in upstream"
+	  elif git merge-base --is-ancestor cb1c03b926ca01619be02f835f382c1dd7d4a478 HEAD; then
 	    _patchname='childwindow-proton.patch' && _patchmsg="Applied child window for vk patch" && nonuser_patcher
 	  elif git merge-base --is-ancestor c2d46eaa1ef07a2921e5711212e9c5c354f58112 HEAD; then
 	    _patchname='childwindow-proton-cb1c03b9.patch' && _patchmsg="Applied child window for vk patch" && nonuser_patcher
@@ -54,7 +56,9 @@
 	fi
 
 	if ( [ "$_childwindow_fix" = "true" ] && [ "$_proton_fs_hack" != "true" ] && [ "$_use_staging" != "true" ] ); then
-	  if git merge-base --is-ancestor cb1c03b926ca01619be02f835f382c1dd7d4a478 HEAD; then
+	  if git merge-base --is-ancestor 21a0c158b94bfc65d4baa95095307a1db396db0c HEAD; then
+	    warning "Child window support have been merged in upstream"
+	  elif git merge-base --is-ancestor cb1c03b926ca01619be02f835f382c1dd7d4a478 HEAD; then
             _patchname='childwindow-proton-mainline.patch' && _patchmsg="Applied child window for vk patch (mainline)" && nonuser_patcher
 	  elif git merge-base --is-ancestor c2d46eaa1ef07a2921e5711212e9c5c354f58112 HEAD; then
             _patchname='childwindow-proton-mainline-cb1c03b9.patch' && _patchmsg="Applied child window for vk patch (mainline)" && nonuser_patcher