From b397df25594b1309b32727517ba92aaae703df30 Mon Sep 17 00:00:00 2001 From: Leon Styhre Date: Sun, 5 May 2024 20:45:11 +0200 Subject: [PATCH] Added support for building against libgit2 v1.8.0 and later --- es-app/src/guis/GuiThemeDownloader.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/es-app/src/guis/GuiThemeDownloader.cpp b/es-app/src/guis/GuiThemeDownloader.cpp index b1008dd08..ec26ea05a 100644 --- a/es-app/src/guis/GuiThemeDownloader.cpp +++ b/es-app/src/guis/GuiThemeDownloader.cpp @@ -395,7 +395,9 @@ bool GuiThemeDownloader::fetchRepository(const std::string& repositoryName, bool LOG(LogError) << "GuiThemeDownloader: " << runtimeError.what() << gitError->message; mRepositoryError = RepositoryError::FETCH_ERROR; mMessage = gitError->message; +#if LIBGIT2_VER_MAJOR < 2 && LIBGIT2_VER_MINOR < 8 git_error_clear(); +#endif git_remote_free(gitRemote); git_repository_free(repository); mPromise.set_value(true); @@ -1441,7 +1443,9 @@ bool GuiThemeDownloader::cloneRepository(const std::string& repositoryName, cons << gitError->message << "\""; mRepositoryError = RepositoryError::CLONE_ERROR; mMessage = gitError->message; +#if LIBGIT2_VER_MAJOR < 2 && LIBGIT2_VER_MINOR < 8 git_error_clear(); +#endif mPromise.set_value(true); return true; }