Skip to content

Commit

Permalink
Ntsync7: rebase + using version from wine merge request (#1393)
Browse files Browse the repository at this point in the history 
* ntsync7: move older version to legacy

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

* ntsync7: rebase against d2b0c4ec8a77d6c42d97e9b37a9f096759f0b94c

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
  • Loading branch information
@Artewar67
Artewar67 authored Feb 26, 2025
1 parent 6d6c75a commit 4842f85
Show file tree
Hide file tree
Showing 9 changed files with 32,986 additions and 7,826 deletions.
16 changes: 12 additions & 4 deletions wine-tkg-git/wine-tkg-patches/misc/fastsync/fastsync
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,10 @@
_patchname='ntsync-config.h.in-alt.patch' && _patchmsg="Using alternative config.h.in patchset for ntsync5" && nonuser_patcher
fi
if [ "$_protonify" = "true" ]; then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 3c29dc1eb86cbe96697193cf679937362c817e02 HEAD ); then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor d2b0c4ec8a77d6c42d97e9b37a9f096759f0b94c HEAD ); then
_patchname='ntsync5-staging-protonify.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 3c29dc1eb86cbe96697193cf679937362c817e02 HEAD ); then
_patchname='ntsync5-staging-protonify-d2b0c4ec.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor e24ba5849843bbef2ca038c12b5bb1b5ff0af8be HEAD ); then
_patchname='ntsync5-staging-protonify-3c29dc1e.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor ac1ff67cfda77618ac05c2c8c38dedc991809316 HEAD ); then
Expand All @@ -127,8 +129,10 @@
_patchname='ntsync5-staging-protonify-7eb72b7b.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
fi
else
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 3c29dc1eb86cbe96697193cf679937362c817e02 HEAD ); then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor d2b0c4ec8a77d6c42d97e9b37a9f096759f0b94c HEAD ); then
_patchname='ntsync5-staging.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 3c29dc1eb86cbe96697193cf679937362c817e02 HEAD ); then
_patchname='ntsync5-staging-d2b0c4ec.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor e24ba5849843bbef2ca038c12b5bb1b5ff0af8be HEAD ); then
_patchname='ntsync5-staging-3c29dc1e.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor ac1ff67cfda77618ac05c2c8c38dedc991809316 HEAD ); then
Expand All @@ -155,8 +159,10 @@
fi
else
if [ "$_protonify" = "true" ]; then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 3c29dc1eb86cbe96697193cf679937362c817e02 HEAD ); then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor d2b0c4ec8a77d6c42d97e9b37a9f096759f0b94c HEAD ); then
_patchname='ntsync5-protonify.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 3c29dc1eb86cbe96697193cf679937362c817e02 HEAD ); then
_patchname='ntsync5-protonify-d2b0c4ec.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 44563c9ab124ae22942313a81957eb5f424e5662 HEAD ); then
_patchname='ntsync5-protonify-3c29dc1e.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 0d7798e803740945df7cb3a406f35b8e3d5462f5 HEAD ); then
Expand All @@ -181,8 +187,10 @@
_patchname='ntsync5-protonify-7eb72b7b.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
fi
else
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 3c29dc1eb86cbe96697193cf679937362c817e02 HEAD ); then
if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor d2b0c4ec8a77d6c42d97e9b37a9f096759f0b94c HEAD ); then
_patchname='ntsync5-mainline.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 3c29dc1eb86cbe96697193cf679937362c817e02 HEAD ); then
_patchname='ntsync5-mainline-d2b0c4ec.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 44563c9ab124ae22942313a81957eb5f424e5662 HEAD ); then
_patchname='ntsync5-mainline-3c29dc1e.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 0d7798e803740945df7cb3a406f35b8e3d5462f5 HEAD ); then
Expand Down
Loading

0 comments on commit 4842f85

Please sign in to comment.