diff options
| author | Homo <gay@disroot.org> | 2025-06-18 14:54:39 +0300 |
|---|---|---|
| committer | Maxim Cournoyer <maxim@guixotic.coop> | 2025-07-10 23:19:37 +0900 |
| commit | 2a7ba05febe4b0da4f1142097b9bd64d26a83e01 (patch) | |
| tree | b264db5cd3049ae6758bcc9201e3c9e3c9200009 /gnu/packages/patches/libjami-libgit2-compatibility.patch | |
| parent | b77c109a71a4af2977628140360789a6bf59b220 (diff) | |
gnu: jami: Update to 20250610.0.
* gnu/packages/patches/jami.scm (libjami): Update to 20250610.0.
[source]: Unregister libgit2 patch.
[inputs]: Delete guile-3.0.
[arguments] <#:configure-flags>: Delete --enable-agent.
(jami): Update to 20250610.0.
[source]: Add patch.
[native-inputs]: Add git.
[inputs]: Add hunspell and zxing-cpp.
* gnu/packages/patches/jami-qwindowkit.patch,
gnu/packages/patches/jami-unbundle-dependencies.patch: Update for jami 20250610.0.
* gnu/local.mk: Unregister patch. Register new patch.
* gnu/packages/patches/libjami-libgit2-compatibility.patch: Remove file.
* gnu/packages/patches/jami-disable-webengine.patch: New file.
Fixes: <https://issues.guix.gnu.org/76231>
Change-Id: I118454aa7c214271725358928b751f4d43cac2db
Signed-off-by: Maxim Cournoyer <maxim@guixotic.coop>
Diffstat (limited to 'gnu/packages/patches/libjami-libgit2-compatibility.patch')
| -rw-r--r-- | gnu/packages/patches/libjami-libgit2-compatibility.patch | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/gnu/packages/patches/libjami-libgit2-compatibility.patch b/gnu/packages/patches/libjami-libgit2-compatibility.patch deleted file mode 100644 index 20896deac4..0000000000 --- a/gnu/packages/patches/libjami-libgit2-compatibility.patch +++ /dev/null @@ -1,23 +0,0 @@ -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 |