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
4dfb83bedfeca4640fa'>tree</a><a href='/guix/commit/guix.scm?id=a6c3a6d7989d8cb6d161e4dfb83bedfeca4640fa'>commit</a><a href='/guix/diff/guix.scm?id=a6c3a6d7989d8cb6d161e4dfb83bedfeca4640fa'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/guix.scm'>
<input type='hidden' name='id' value='a6c3a6d7989d8cb6d161e4dfb83bedfeca4640fa'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=a6c3a6d7989d8cb6d161e4dfb83bedfeca4640fa'>root</a>/<a href='/guix/log/guix.scm?id=a6c3a6d7989d8cb6d161e4dfb83bedfeca4640fa'>guix.scm</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/guix.scm?id=a6c3a6d7989d8cb6d161e4dfb83bedfeca4640fa&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2022-07-12 01:17:45 +0200'>2022-07-12</span></td><td><a href='/guix/commit/guix.scm?id=4574ef267e543bcac97d9c400f30cb731df29181'>guix: Really export 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 3858275962f1ac567b5dce2355035f9eddea0a05, which
didn't have any effect.

* guix.scm: Explicitly use (guix packages) so #:re-export-and-replace
is effective.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-09-14 11:50:58 +0200'>2021-09-14</span></td><td><a href='/guix/commit/guix.scm?id=3858275962f1ac567b5dce2355035f9eddea0a05'>guix: Replace 'define-public'.</a><span class='msg-avail'>...<span class='msg-tooltip'>This is a followup to 8531997d2a1e10d574a6e9ab70bc86ade6af4733.

* guix.scm: Use #:re-export-and-replace for 'define-public'.
</span></span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2021-06-29 00:00:13 +0200'>2021-06-29</span></td><td><a href='/guix/commit/guix.scm?id=e059adcb6001ab0353d969b24030d0c342f8830e'>(guix) no longer pulls in (guix ftp-client).</a><span class='msg-avail'>...<span class='msg-tooltip'>That choice was made in 2014 and never made much sense.

* guix.scm (%public-modules): Remove 'ftp-client'.
</span></span></td><td>Ludovic Courtès</td></tr>