Skip to content

Commit

Permalink
proton-tkg-additions: Rebase patch, script and rename older version (#…
Browse files Browse the repository at this point in the history
…1251)

* proton-tkg-additions: Rebase patch and update script

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

* proton-tkg-additions: Rename older version

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

* proton-tkg-additions: remove space in script

* fix script

---------

Signed-off-by: Kirill Artemev <artewar6767@gmail.com>
  • Loading branch information
Artewar67 authored Aug 30, 2024
1 parent e5e156c commit c4982f9
Show file tree
Hide file tree
Showing 3 changed files with 472 additions and 19 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -536,8 +536,10 @@
fi
fi
if [ "$_proton_fs_hack" != "true" ] && [ "$_wayland_driver" != "true" ] && [ "$_use_staging" = "true" ] && [ "$_childwindow_fix" = "true" ] && git merge-base --is-ancestor 3ded60bd1654dc689d24a23305f4a93acce3a6f2 HEAD; then
if git merge-base --is-ancestor 5d860f62f6cb70a8f3b1b8ca0a9471ab1da56c36 HEAD; then
if git merge-base --is-ancestor cb1c03b926ca01619be02f835f382c1dd7d4a478 HEAD; then
_patchname='proton-tkg-additions.patch' && _patchmsg="Using additional Proton-tkg patches" && nonuser_patcher
elif git merge-base --is-ancestor 5d860f62f6cb70a8f3b1b8ca0a9471ab1da56c36 HEAD; then
_patchname='proton-tkg-additions-cb1c03.patch' && _patchmsg="Using additional Proton-tkg patches" && nonuser_patcher
elif git merge-base --is-ancestor 48e6bf3cf1aabdd2ac640f572416b9169e324f21 HEAD; then
_patchname='proton-tkg-additions-5d860f.patch' && _patchmsg="Using additional Proton-tkg patches" && nonuser_patcher
elif git merge-base --is-ancestor 3c9423618673702ab7a3129f0ca61a0605adab35 HEAD; then
Expand Down
Loading

0 comments on commit c4982f9

Please sign in to comment.