fsync: rebase against 962017beef4a0405e4fece0075e286e445da55da (#1308)

* fsync: rebase against 962017beef4a0405e4fece0075e286e445da55da Signed-off-by: Kirill Artemev <[email protected]> * fsync: move older version to legacy Signed-off-by: Kirill Artemev <[email protected]> * fsync: fix patches Signed-off-by: Kirill Artemev <[email protected]> --------- Signed-off-by: Kirill Artemev <[email protected]>
Frogging-Family · Nov 9, 2024 · 29cbd84 · 29cbd84
1 parent 780f323
commit 29cbd84
Show file tree

Hide file tree

Showing 5 changed files with 7,580 additions and 2 deletions.
diff --git a/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync b/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync
@@ -4,8 +4,10 @@
 	  # fsync-unix - requares 5.20+ Wine version
 	  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 0c249e6125fc9dc6ee86b4ef6ae0d9fa2fc6291b HEAD ); then
 	    if [ "$_staging_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='fsync-unix-staging.patch' && _patchmsg="Applied fsync patches (unix, staging)" && nonuser_patcher
+	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor e01b70851fae74c9a4067e00f4c48f17f319ed2d HEAD ); then
+	        _patchname='fsync-unix-staging-962017be.patch' && _patchmsg="Applied fsync patches (unix, staging)" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor cebad42f35c3360ee73c0ff63baa546cd1bf35aa HEAD ); then
 	        _patchname='fsync-unix-staging-e01b708.patch' && _patchmsg="Applied fsync patches (unix, staging)" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 7f53ca70bad150af094e77f7dde582dc3f50ff34 HEAD ); then
@@ -59,8 +61,10 @@
 	        fi
 	      fi
 	    elif [ "$_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='fsync-unix-mainline.patch' && _patchmsg="Applied fsync patches (unix, mainline)" && nonuser_patcher
+	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor e01b70851fae74c9a4067e00f4c48f17f319ed2d HEAD ); then
+	        _patchname='fsync-unix-mainline-962017be.patch' && _patchmsg="Applied fsync patches (unix, mainline)" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor cebad42f35c3360ee73c0ff63baa546cd1bf35aa HEAD ); then
 	        _patchname='fsync-unix-mainline-e01b708.patch' && _patchmsg="Applied fsync patches (unix, mainline)" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor c14de4c85e79563f5e859765d0015892ae925cd6 HEAD ); then

diff --git a/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync-unix-mainline.patch b/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync-unix-mainline.patch
@@ -3056,6 +3056,15 @@ index e59a5b6c183..d0ea32a24d5 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 */
++    NULL,                                    /* get_fsync_idx */     
+     no_satisfied,                            /* satisfied */
+     no_signal,                               /* signal */
+     named_pipe_dir_get_fd,                   /* get_fd */
 diff --git a/server/object.h b/server/object.h
 index 5b6bb9cbfe1..4c92b174ef3 100644
 --- a/server/object.h

diff --git a/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync-unix-staging.patch b/wine-tkg-git/wine-tkg-patches/proton/fsync/fsync-unix-staging.patch
@@ -3056,6 +3056,15 @@ index e59a5b6c183..d0ea32a24d5 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 */
++    NULL,                                    /* get_fsync_idx */     
+     no_satisfied,                            /* satisfied */
+     no_signal,                               /* signal */
+     named_pipe_dir_get_fd,                   /* get_fd */
 diff --git a/server/object.h b/server/object.h
 index 5b6bb9cbfe1..4c92b174ef3 100644
 --- a/server/object.h