mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 14:56:54 +01:00
011bf3280b
* gnu/packages/patches/libjami-libgit2-compatibility.patch: New file. * gnu/packages/jami.scm (libjami)[source]: Use it. * gnu/local.mk (dist_patch_DATA): Add it. Change-Id: I6a87d47f9a0ec1663b7ad3459960e9aaaf4bf562
23 lines
1.2 KiB
Diff
23 lines
1.2 KiB
Diff
Libgit2 1.8.0 went for 'git_commit *const' but 1.8.4 reverted back to
|
|
'const git_commit *'.
|
|
|
|
--- a/src/jamidht/conversationrepository.cpp
|
|
+++ b/src/jamidht/conversationrepository.cpp
|
|
@@ -783,7 +783,7 @@ ConversationRepository::Impl::createMergeCommit(git_index* index, const std::str
|
|
// Commit
|
|
git_buf to_sign = {};
|
|
// Check if the libgit2 library version is 1.8.0 or higher
|
|
-#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 )
|
|
+#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 && LIBGIT2_VER_REVISION <= 3)
|
|
// For libgit2 version 1.8.0 and above
|
|
git_commit* const parents_ptr[2] {parents[0].get(), parents[1].get()};
|
|
#else
|
|
@@ -1870,7 +1870,7 @@ ConversationRepository::Impl::commit(const std::string& msg, bool verifyDevice)
|
|
|
|
git_buf to_sign = {};
|
|
// Check if the libgit2 library version is 1.8.0 or higher
|
|
-#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 )
|
|
+#if( LIBGIT2_VER_MAJOR > 1 ) || ( LIBGIT2_VER_MAJOR == 1 && LIBGIT2_VER_MINOR >= 8 && LIBGIT2_VER_REVISION <= 3)
|
|
// For libgit2 version 1.8.0 and above
|
|
git_commit* const head_ref[1] = {head_commit.get()};
|
|
#else
|