Commit 3ec721dc authored by Tk-Glitch's avatar Tk-Glitch

wine-tkg-git: Update proton meta patchsets for 9d38c48 and move previous versions to legacy

parent d9fac49f
......@@ -315,6 +315,7 @@ source=("$_winesrcdir"::"${_winesrctarget}${_plain_commit}"
'proton-tkg-50aeb5e.patch' # Proton-tkg (<50aeb5e)
'proton-tkg-56a6bc8.patch' # Proton-tkg (<56a6bc8)
'proton-tkg-14df018.patch' # Proton-tkg (<14df018)
'proton-tkg-9d38c48.patch' # Proton-tkg (<9d38c48)
'proton-tkg.patch' # Proton-tkg
'proton-tkg-rpc.patch' # necessary pre-patch for Proton-tkg
'proton-tkg-staging-8d25965.patch' # Proton-tkg-staging (<8d25965)
......@@ -335,6 +336,7 @@ source=("$_winesrcdir"::"${_winesrctarget}${_plain_commit}"
'proton-tkg-staging-50aeb5e.patch' # Proton-tkg-staging (<50aeb5e)
'proton-tkg-staging-56a6bc8.patch' # Proton-tkg-staging (<56a6bc8)
'proton-tkg-staging-14df018.patch' # Proton-tkg-staging (<14df018)
'proton-tkg-staging-9d38c48.patch' # Proton-tkg-staging (<9d38c48)
'proton-tkg-staging.patch' # Proton-tkg-staging
'proton-tkg-staging-rpc.patch' # necessary pre-patch for Proton-tkg-staging
'proton-tkg-steamclient-swap.patch' # Key steamclient substitution hack
......@@ -515,6 +517,7 @@ md5sums=('SKIP'
'fbc63c3d9c499b5952a2fcf8b5fe283f'
'0c27485d909e3dfc81ab3e456dcfdb14'
'33707b2d692412a3ebee6a1d86a12cd0'
'466211e827d7b0204e18221a4100a1ff'
'7d9a7cf523c7283c64266148707b8bac'
'fbc02256e0e85668be75e0275637d6c1'
'4aa05580e78d36fdbd80f2ef2f46a6b3'
......@@ -535,6 +538,7 @@ md5sums=('SKIP'
'dda3a74b697305a70347b2e527d9197c'
'e14e56831e4ee5473019afc1bea8938d'
'cfe4c618793d7e4f6ddd6ed06e7eef91'
'b7190c8daab744307618e304bec0abcf'
'f404adafc8648495270e01241cd0601e'
'8681c98f6d488957a206c9c1f2f9547f'
'3d5518c89320a59400774a86b9a1cf2f'
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -3174,9 +3174,9 @@ index 89ad4175c7e..0489f4c285f 100644
JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info;
JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation;
+ JOBOBJECT_BASIC_ACCOUNTING_INFORMATION basic_accounting_info;
DWORD dwret, ret_len;
DWORD ret_len;
PROCESS_INFORMATION pi[2];
HANDLE job;
char buffer[50];
@@ -2647,6 +2648,14 @@ static void test_QueryInformationJobObject(void)
ok(ret_len == sizeof(ext_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len);
expect_eq_d(0, basic_limit_info->LimitFlags);
......
......@@ -3116,9 +3116,9 @@ index 89ad4175c7e..0489f4c285f 100644
JOBOBJECT_EXTENDED_LIMIT_INFORMATION ext_limit_info;
JOBOBJECT_BASIC_LIMIT_INFORMATION *basic_limit_info = &ext_limit_info.BasicLimitInformation;
+ JOBOBJECT_BASIC_ACCOUNTING_INFORMATION basic_accounting_info;
DWORD dwret, ret_len;
DWORD ret_len;
PROCESS_INFORMATION pi[2];
HANDLE job;
char buffer[50];
@@ -2647,6 +2648,14 @@ static void test_QueryInformationJobObject(void)
ok(ret_len == sizeof(ext_limit_info), "QueryInformationJobObject returned ret_len=%u\n", ret_len);
expect_eq_d(0, basic_limit_info->LimitFlags);
......
......@@ -1234,7 +1234,7 @@ EOM
fi
if [ "$_EXTERNAL_INSTALL" == "true" ] && [ "$_EXTERNAL_INSTALL_TYPE" == "proton" ] && [ "$_unfrog" != "true" ] || ([ "$_protonify" == "true" ] && git merge-base --is-ancestor 74dc0c5df9c3094352caedda8ebe14ed2dfd615e HEAD); then
if git merge-base --is-ancestor 14df0183b0b43049d0f645f72f435309cb6836a4 HEAD; then
if git merge-base --is-ancestor 9d38c4864c4800313812feef2c3bc6ca6551ce57 HEAD; then
if [ "$_use_staging" == "true" ]; then
_patchname='proton-tkg-staging-rpc.patch' && _patchmsg="Using Steam-specific Proton-tkg patches (staging) 1/3" && nonuser_patcher
_patchname='proton-tkg-staging.patch' && _patchmsg="Using Steam-specific Proton-tkg patches (staging) 2/3" && nonuser_patcher
......@@ -1249,7 +1249,11 @@ EOM
fi
fi
else
if git merge-base --is-ancestor 56a6bc87acbbbee74fb6cd8e77ae61828e274c2d HEAD; then
if git merge-base --is-ancestor 14df0183b0b43049d0f645f72f435309cb6836a4 HEAD; then
_lastcommit="9d38c48"
_rpc="1"
_stmbits="1"
elif git merge-base --is-ancestor 56a6bc87acbbbee74fb6cd8e77ae61828e274c2d HEAD; then
_lastcommit="14df018"
_rpc="1"
_stmbits="1"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment