From 9ed847f8289b4a6f1855c0aa0cba9c94e09a9dc8 Mon Sep 17 00:00:00 2001
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
Date: Mon, 27 May 2024 13:11:13 -0400
Subject: gnu: jami: Update to 20240524.0.

* gnu/packages/jami.scm (libjami): Update to 20240524.0.
[source]: Remove stale integration tests patch.
[arguments] <#tests?> Set to #f, disabling tests.
[inputs]: Replace libgit2-1.6 with libgit2-1.8.
[phases] <move-jamid>: Update comment.
* gnu/packages/patches/jami-disable-integration-tests.patch: Delete file.
* gnu/local.mk (dist_patch_DATA): De-register it.
(jami):  Update to 20240524.0.

Series-postfix: telephony-team
Change-Id: I6e46ca936951ff41e8f322eed2b5a663e1e3d197
---
 gnu/packages/jami.scm | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'gnu/packages/jami.scm')

diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm
index 81c9a3d3c2..cb5995cc14 100644
--- a/gnu/packages/jami.scm
+++ b/gnu/packages/jami.scm
@@ -78,8 +78,8 @@ (define-module (gnu packages jami)
 ;;; When updating Jami, make sure that the patches used for ffmpeg-jami are up
 ;;; to date with those listed in
 ;;; <https://review.jami.net/plugins/gitiles/jami-daemon/+/refs/heads/master/contrib/src/ffmpeg/rules.mak>.
-(define %jami-nightly-version "20240325.0")
-(define %jami-daemon-commit "32f39e65483cb22729eb922d72434013b337f2c9")
+(define %jami-nightly-version "20240524.0")
+(define %jami-daemon-commit "fd2f2815448ce4072dcbc3995950788573d63f3b")
 
 (define-public libjami
   (package
@@ -93,14 +93,18 @@ (define-public libjami
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "0kha2v46l5hmycklhyxrs2qybm640nbrk98z1xvicjxyq6bfszh4"))
+                "1bw0laj93w4pvlxsr5abz59805ypbmg21z5393yzm82j4d35cfyr"))
               (patches (search-patches
-                        "libjami-ac-config-files.patch"
-                        "jami-disable-integration-tests.patch"))))
+                        "libjami-ac-config-files.patch"))))
     (outputs '("out" "bin" "debug"))    ;"bin' contains jamid
     (build-system gnu-build-system)
     (arguments
      (list
+      ;; XXX: The test suites reportedly takes 2 h 30 to run by upstream's CI.
+      ;; Many tests also fail, within and without the containerized
+      ;; environment.  Some issues have recently been fixed, so try again in
+      ;; the next release.
+      #:tests? #f
       ;; The agent links the daemon binary with libguile, which enables the
       ;; execution of test plans described in Scheme.  It may be useful in
       ;; user scripts too, until more general purpose Scheme bindings are made
@@ -122,9 +126,8 @@ (define-public libjami
                         (find-files (string-append #$output "/lib")
                                     "\\.a$"))))
           (add-after 'install 'move-jamid
-            ;; This nearly halves the size of the main output (from 1566.2 MiB
-            ;; to 833.6 MiB), due to not depending on dbus-c++ and its large
-            ;; dependencies.
+            ;; This reduces the size of the main output, due to not depending
+            ;; on sdbus-c++.
             (lambda* (#:key outputs #:allow-other-keys)
               (let ((libexec (string-append #$output:bin "/libexec"))
                     (share (string-append #$output:bin "/share")))
@@ -144,7 +147,7 @@ (define-public libjami
            jack-1
            jsoncpp
            libarchive
-           libgit2-1.6
+           libgit2-1.8
            libnatpmp
            libsecp256k1
            libupnp
@@ -227,7 +230,7 @@ (define-public jami
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "08lv8azjd47n56i25d9ax248xmidixpsnwh5kc4qjxib7985bdhs"))
+                "1wqi50n80khyngj48brc8wg3m6jq471h9gm62yxpj4f8z5j81ncd"))
               (patches (search-patches
                         "jami-libjami-headers-search.patch"
                         "jami-qwindowkit.patch"
-- 
cgit v1.2.3