esync: rebase patches and fix fsync patches (#1314)

* esync: rebase patches and fix fsync patches Signed-off-by: Kirill Artemev <[email protected]> * fix patches Signed-off-by: Kirill Artemev <[email protected]> --------- Signed-off-by: Kirill Artemev <[email protected]>
Frogging-Family · Nov 10, 2024 · 4583dc4 · 4583dc4
1 parent 29cbd84
commit 4583dc4
Show file tree

Hide file tree

Showing 5 changed files with 4,777 additions and 5 deletions.
diff --git a/wine-tkg-git/wine-tkg-patches/proton/esync/esync b/wine-tkg-git/wine-tkg-patches/proton/esync/esync
@@ -2,8 +2,10 @@
 
 	# esync
 	if [ "$_use_esync" = "true" ]; then
-	  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor e01b70851fae74c9a4067e00f4c48f17f319ed2d HEAD ); then
+	  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 962017beef4a0405e4fece0075e286e445da55da HEAD ); then
 	    _patchname='esync-unix-mainline.patch' && _patchmsg="Using Esync (unix, mainline) patchset" && nonuser_patcher
+	  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor e01b70851fae74c9a4067e00f4c48f17f319ed2d HEAD ); then
+	    _patchname='esync-unix-mainline-962017be.patch' && _patchmsg="Using Esync (unix, mainline) patchset" && nonuser_patcher
 	  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor cebad42f35c3360ee73c0ff63baa546cd1bf35aa HEAD ); then
 	    _patchname='esync-unix-mainline-e01b708.patch' && _patchmsg="Using Esync (unix, mainline) patchset" && nonuser_patcher
 	  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 9305ac22067786c909071182a3ed65c2b898a102 HEAD ); then

diff --git a/wine-tkg-git/wine-tkg-patches/proton/esync/esync-unix-mainline.patch b/wine-tkg-git/wine-tkg-patches/proton/esync/esync-unix-mainline.patch
@@ -4019,6 +4019,14 @@ index c83e8c17027..e59a5b6c183 100644
      no_satisfied,                            /* satisfied */
      no_signal,                               /* signal */
      named_pipe_device_file_get_fd,           /* get_fd */
+@@ -344,6 +344,7 @@
+     add_queue,                               /* add_queue */
+     remove_queue,                            /* remove_queue */
+     default_fd_signaled,                     /* signaled */
++    NULL,                                    /* get_esync_fd */
+     no_satisfied,                            /* satisfied */
+     no_signal,                               /* signal */
+     named_pipe_dir_get_fd,                   /* get_fd */
 diff --git a/server/object.h b/server/object.h
 index 43f636b397b..5b6bb9cbfe1 100644
 --- a/server/object.h