haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use deprecated GIT defines 

Older Ubuntus/Debians use libgit2 that does not support the new defines.
Newer libgit2 provides a name define translation
This commit is contained in:
Seth Hillbrand 2023-10-27 14:59:15 -07:00
parent 61d03b41ec
commit 1c847889e7
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/dialogs/git/dialog_git_repository.cpp
View File

@ -264,7 +264,7 @@ void DIALOG_GIT_REPOSITORY::OnTestClick( wxCommandEvent& event )
if( dialog->GetRepoType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_LOCAL ) if( dialog->GetRepoType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_LOCAL )
return GIT_PASSTHROUGH; return GIT_PASSTHROUGH;
if( aAllowedTypes & GIT_CREDENTIAL_USERNAME if( aAllowedTypes & GIT_CREDTYPE_USERNAME
&& !( dialog->GetTested() & GIT_CREDTYPE_USERNAME ) ) && !( dialog->GetTested() & GIT_CREDTYPE_USERNAME ) )
{ {
wxString username = dialog->GetUsername().Trim().Trim( false ); wxString username = dialog->GetUsername().Trim().Trim( false );
@ -272,7 +272,7 @@ void DIALOG_GIT_REPOSITORY::OnTestClick( wxCommandEvent& event )
dialog->GetTested() |= GIT_CREDTYPE_USERNAME; dialog->GetTested() |= GIT_CREDTYPE_USERNAME;
} }
else if( dialog->GetRepoType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_HTTPS else if( dialog->GetRepoType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_HTTPS
&& ( aAllowedTypes & GIT_CREDENTIAL_USERPASS_PLAINTEXT ) && ( aAllowedTypes & GIT_CREDTYPE_USERPASS_PLAINTEXT )
&& !( dialog->GetTested() & GIT_CREDTYPE_USERPASS_PLAINTEXT ) ) && !( dialog->GetTested() & GIT_CREDTYPE_USERPASS_PLAINTEXT ) )
{ {
wxString username = dialog->GetUsername().Trim().Trim( false ); wxString username = dialog->GetUsername().Trim().Trim( false );
@ -283,7 +283,7 @@ void DIALOG_GIT_REPOSITORY::OnTestClick( wxCommandEvent& event )
dialog->GetTested() |= GIT_CREDTYPE_USERPASS_PLAINTEXT; dialog->GetTested() |= GIT_CREDTYPE_USERPASS_PLAINTEXT;
} }
else if( dialog->GetRepoType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_SSH else if( dialog->GetRepoType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_SSH
&& ( aAllowedTypes & GIT_CREDENTIAL_SSH_KEY ) && ( aAllowedTypes & GIT_CREDTYPE_SSH_KEY )
&& !( dialog->GetTested() & GIT_CREDTYPE_SSH_KEY ) ) && !( dialog->GetTested() & GIT_CREDTYPE_SSH_KEY ) )
{ {
// SSH key authentication // SSH key authentication

6
common/git/kicad_git_common.cpp
View File

@ -499,7 +499,7 @@ extern "C" int credentials_cb( git_cred** aOut, const char* aUrl, const char* aU
if( parent->GetConnType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_LOCAL ) if( parent->GetConnType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_LOCAL )
return GIT_PASSTHROUGH; return GIT_PASSTHROUGH;
if( aAllowedTypes & GIT_CREDENTIAL_USERNAME if( aAllowedTypes & GIT_CREDTYPE_USERNAME
&& !( parent->TestedTypes() & GIT_CREDTYPE_USERNAME ) ) && !( parent->TestedTypes() & GIT_CREDTYPE_USERNAME ) )
{ {
wxString username = parent->GetUsername().Trim().Trim( false ); wxString username = parent->GetUsername().Trim().Trim( false );
@ -507,7 +507,7 @@ extern "C" int credentials_cb( git_cred** aOut, const char* aUrl, const char* aU
parent->TestedTypes() |= GIT_CREDTYPE_USERNAME; parent->TestedTypes() |= GIT_CREDTYPE_USERNAME;
} }
else if( parent->GetConnType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_HTTPS else if( parent->GetConnType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_HTTPS
&& ( aAllowedTypes & GIT_CREDENTIAL_USERPASS_PLAINTEXT ) && ( aAllowedTypes & GIT_CREDTYPE_USERPASS_PLAINTEXT )
&& !( parent->TestedTypes() & GIT_CREDTYPE_USERPASS_PLAINTEXT ) ) && !( parent->TestedTypes() & GIT_CREDTYPE_USERPASS_PLAINTEXT ) )
{ {
wxString username = parent->GetUsername().Trim().Trim( false ); wxString username = parent->GetUsername().Trim().Trim( false );
@ -518,7 +518,7 @@ extern "C" int credentials_cb( git_cred** aOut, const char* aUrl, const char* aU
parent->TestedTypes() |= GIT_CREDTYPE_USERPASS_PLAINTEXT; parent->TestedTypes() |= GIT_CREDTYPE_USERPASS_PLAINTEXT;
} }
else if( parent->GetConnType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_SSH else if( parent->GetConnType() == KIGIT_COMMON::GIT_CONN_TYPE::GIT_CONN_SSH
&& ( aAllowedTypes & GIT_CREDENTIAL_SSH_KEY ) && ( aAllowedTypes & GIT_CREDTYPE_SSH_KEY )
&& !( parent->TestedTypes() & GIT_CREDTYPE_SSH_KEY ) ) && !( parent->TestedTypes() & GIT_CREDTYPE_SSH_KEY ) )
{ {
// SSH key authentication // SSH key authentication