diff options
author | Maxim Cournoyer <[email protected]> | 2022-11-03 17:16:36 -0400 |
---|---|---|
committer | Maxim Cournoyer <[email protected]> | 2022-11-11 23:52:04 -0500 |
commit | d7d09a277376744a17500ad62f6ba5580a53c878 (patch) | |
tree | 6be1036dd2d7107fffb0f268f28224dbf1418969 /gnu/packages/patches/jami-fix-crash-on-block-contact.patch | |
parent | 8fc7f20cb2f5779a9c23c9e8745cd471d4e36fc6 (diff) |
gnu: jami: Update to 20221031.1308.130cc26.
* gnu/packages/jami.scm (libjami, jami): Update to 20221031.1308.130cc26.
(%jami-sources): Remove jami-fix-crash-on-block-contact patch. Add
jami-disable-integration-tests and jami-no-webengine patches.
(pjproject-jami): Update to 2.12-1.513a3f1.
(ffmpeg-jami): Replace libvpx with libvpx-next. Replace libx264 with
libx264-next.
(libjami): Update comment with upstream issue URL.
[tests?]: Remove argument, enabling test suite.
[configure-flags]: Remove "--disable-static".
[phases] {delete-static-libraries}: New phase.
(jami) [tests?]: Update comment.
[configure-flags]: Remove "-DLIBJAMI_XML_INTERFACES_DIR=" flag.
[phases] {patch-source}: Delete phase.
* gnu/packages/patches/jami-fix-crash-on-block-contact.patch: Delete patch.
* gnu/packages/patches/jami-disable-integration-tests.patch: New file.
* gnu/packages/patches/jami-no-webengine.patch: New file.
* gnu/local.mk (dist_patch_DATA): Update accordingly.
Diffstat (limited to 'gnu/packages/patches/jami-fix-crash-on-block-contact.patch')
-rw-r--r-- | gnu/packages/patches/jami-fix-crash-on-block-contact.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/gnu/packages/patches/jami-fix-crash-on-block-contact.patch b/gnu/packages/patches/jami-fix-crash-on-block-contact.patch deleted file mode 100644 index 60dab79296..0000000000 --- a/gnu/packages/patches/jami-fix-crash-on-block-contact.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 673dc5f525c9d478fc22f8ea0a50d9849a81f6c8 Mon Sep 17 00:00:00 2001 -From: Kateryna Kostiuk <[email protected]> -Date: Fri, 2 Sep 2022 13:32:10 -0400 -Subject: [PATCH] conversation: fix crash when block contact - -This patch fixes crash that happened when block contact -for not active account. - -GitLab: #758 -Change-Id: I5347394a67cdffe0d95c9ee03aedf9d2618cec55 ---- - src/jamidht/jamiaccount.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/daemon/src/jamidht/jamiaccount.cpp b/daemon/src/jamidht/jamiaccount.cpp -index fe15eedb2..9d0a5ee68 100644 ---- a/daemon/src/jamidht/jamiaccount.cpp -+++ b/daemon/src/jamidht/jamiaccount.cpp -@@ -1129,7 +1129,9 @@ JamiAccount::loadAccount(const std::string& archive_password, - if (auto convModule = shared->convModule()) - convModule->removeContact(uri, banned); - // Remove current connections with contact -- shared->connectionManager_->closeConnectionsWith(uri); -+ if (shared->connectionManager_) { -+ shared->connectionManager_->closeConnectionsWith(uri); -+ } - // Update client. - emitSignal<DRing::ConfigurationSignal::ContactRemoved>(shared->getAccountID(), - uri, --- -2.37.3 - |