ntsync7: rebase against 9d6455f9 (#1477)

* ntsync7: rebase against 9d6455f9

Signed-off-by: Kirill Artemev <[email protected]>

* ntsync7: move older version to legacy

Signed-off-by: Kirill Artemev <[email protected]>

* fix fastsync script

Signed-off-by: Kirill Artemev <[email protected]>

---------

Signed-off-by: Kirill Artemev <[email protected]>

Author: Artewar67

wine-tkg-git/wine-tkg-patches/misc/fastsync/fastsync

@@ -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 99d1e60a51726f80a212aabbb5e1e462844cd7db HEAD ); then
+		  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 9d6455f91cb7a7d166d5c4708d528b43a63eb4d7 HEAD ); then
 	      _patchname='ntsync5-staging-protonify.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
+		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 99d1e60a51726f80a212aabbb5e1e462844cd7db HEAD ); then
+	      _patchname='ntsync5-staging-protonify-9d6455f9.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 7b17d1077843d275f7d2a25abe0e5673ca8a2f77 HEAD ); then
 	      _patchname='ntsync5-staging-protonify-99d1e60a.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 94ed7498be3b4510c3f252216a130d48354ecb2e HEAD ); then
@@ -145,8 +147,10 @@
 	      _patchname='ntsync5-staging-protonify-7eb72b7b.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 	      fi
         else
-		  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 99d1e60a51726f80a212aabbb5e1e462844cd7db HEAD ); then
+		  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 9d6455f91cb7a7d166d5c4708d528b43a63eb4d7 HEAD ); then
 	      _patchname='ntsync5-staging.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
+		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 99d1e60a51726f80a212aabbb5e1e462844cd7db HEAD ); then
+	      _patchname='ntsync5-staging-9d6455f9.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 7b17d1077843d275f7d2a25abe0e5673ca8a2f77 HEAD ); then
 	      _patchname='ntsync5-staging-99d1e60a.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 94ed7498be3b4510c3f252216a130d48354ecb2e HEAD ); then
@@ -191,8 +195,10 @@
 		fi
 	  else
 	    if [ "$_protonify" = "true" ]; then
-		  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 99d1e60a51726f80a212aabbb5e1e462844cd7db HEAD ); then
+		  if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 9d6455f91cb7a7d166d5c4708d528b43a63eb4d7 HEAD ); then
 		    _patchname='ntsync5-protonify.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
+		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 99d1e60a51726f80a212aabbb5e1e462844cd7db HEAD ); then
+		    _patchname='ntsync5-protonify-9d6455f9.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 7b17d1077843d275f7d2a25abe0e5673ca8a2f77 HEAD ); then
 		    _patchname='ntsync5-protonify-99d1e60a.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 		  elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 94ed7498be3b4510c3f252216a130d48354ecb2e HEAD ); then
@@ -235,8 +241,10 @@
 	      _patchname='ntsync5-protonify-7eb72b7b.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 		  fi
 		else
-	      if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 99d1e60a51726f80a212aabbb5e1e462844cd7db HEAD ); then
+	      if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 9d6455f91cb7a7d166d5c4708d528b43a63eb4d7 HEAD ); then
 		    _patchname='ntsync5-mainline.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
+	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 99d1e60a51726f80a212aabbb5e1e462844cd7db HEAD ); then
+		    _patchname='ntsync5-mainline-9d6455f9.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 7b17d1077843d275f7d2a25abe0e5673ca8a2f77 HEAD ); then
 		    _patchname='ntsync5-mainline-99d1e60a.patch' && _patchmsg="Using ntsync patchset" && nonuser_patcher
 	      elif ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 94ed7498be3b4510c3f252216a130d48354ecb2e HEAD ); then