Hotfixer: Update pulse_reverts hotfix for 18b98df

Frogging-Family · Aug 28, 2021 · f218429 · f218429
1 parent 90424bf
commit f218429
Show file tree

Hide file tree

Showing 3 changed files with 8,779 additions and 1 deletion.
diff --git a/wine-tkg-git/wine-tkg-patches/hotfixes/hotfixer b/wine-tkg-git/wine-tkg-patches/hotfixes/hotfixer
@@ -568,7 +568,11 @@ if [ "$_use_staging" = "true" ] && ( cd "${srcdir}"/"${_stgsrcdir}" && git merge
         _hotfixes+=("$_where"/wine-tkg-patches/hotfixes/restore_staging_winepulse/wine-pulseaudio-fixup)
       fi
     else
-      _hotfixes+=("$_where"/wine-tkg-patches/hotfixes/restore_staging_winepulse/pulse_reverts)
+      if ( cd "${srcdir}"/"${_winesrcdir}" && git merge-base --is-ancestor 18b98df060071aad16f6fab591ce6beb127b7f14 HEAD ); then
+        _hotfixes+=("$_where"/wine-tkg-patches/hotfixes/restore_staging_winepulse/pulse_reverts-2)
+      else
+        _hotfixes+=("$_where"/wine-tkg-patches/hotfixes/restore_staging_winepulse/pulse_reverts-1)
+      fi
     fi
 
     _hotfix_stagingreverts+=(183fd3e089b170d5b7405a80a23e81dc7c4dd682)

diff --git a/...ging_winepulse/pulse_reverts.myearlypatch → ...ng_winepulse/pulse_reverts-1.myearlypatch b/...ging_winepulse/pulse_reverts.myearlypatch → ...ng_winepulse/pulse_reverts-1.myearlypatch