From patchwork Fri Aug 18 18:13:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 52991 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 57F0427BBE9; Fri, 18 Aug 2023 19:18:44 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5C8C427BBE2 for ; Fri, 18 Aug 2023 19:18:42 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qX42y-0006lR-2c; Fri, 18 Aug 2023 14:18:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qX42v-0006k8-Rc for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:06 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qX42v-0000L5-Jc for guix-patches@gnu.org; Fri, 18 Aug 2023 14:18:05 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qX42w-0003Ft-2b; Fri, 18 Aug 2023 14:18:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#65371] [PATCH telephony-team 10/10] gnu: jami: Update to 20230619.1. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Fri, 18 Aug 2023 18:18:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 65371 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 65371@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer X-Debbugs-Original-Xcc: Maxim Cournoyer Received: via spool by 65371-submit@debbugs.gnu.org id=B65371.169238265412403 (code B ref 65371); Fri, 18 Aug 2023 18:18:06 +0000 Received: (at 65371) by debbugs.gnu.org; 18 Aug 2023 18:17:34 +0000 Received: from localhost ([127.0.0.1]:48734 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42P-0003Dy-Ub for submit@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:34 -0400 Received: from mail-qt1-x836.google.com ([2607:f8b0:4864:20::836]:62485) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qX42I-0003D4-Ff for 65371@debbugs.gnu.org; Fri, 18 Aug 2023 14:17:28 -0400 Received: by mail-qt1-x836.google.com with SMTP id d75a77b69052e-4085ee5b1e6so10994011cf.0 for <65371@debbugs.gnu.org>; Fri, 18 Aug 2023 11:17:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692382640; x=1692987440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VdZY7SzxVZB3AmmT9UDSVM1uI4CoOp4LWwHdM9hr9n4=; b=Q4y9MaisomXYKWqO1Vybxo5boVHq4WDdCcn68m2NLq69r0f3sAQheCdc3nGfnh5NLu Y1QIrH0HyvaxpkzuOP+uiv3KXnhj4mTvk5OTa207/Oc3Z6JXsCQjG99PK6DQm5IciRc2 SUKfHxH+2dnJu2SfYAG8/8Nc74X/hnYxakIZpvkQznO3If45n4pEp5o+tR6TRK2yS0CJ iXECgu6RBXj0ya1r5H8oLwyj+mPhOZwYwqTUp8wPEQADyL1oePy+HN8j4gsv3vtJ2bRk bDMZEZE+skVzVepdGyCCiqrGeF7Jj0KdUu6HARdjonHiQm0NaesKQ3tWYG4tqv+VfW0m ZI3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692382640; x=1692987440; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VdZY7SzxVZB3AmmT9UDSVM1uI4CoOp4LWwHdM9hr9n4=; b=V+/kRfU4SE5ruaDr0PzOx0Hp2mH33ct0Y1jQGdC865GxvzZuaQZu6+ODbFax+81T6C 9fgjccRj4jELyLqxC7LGOKitAZJeacz81AyzObSGWvIugUlzzkTvuoCXKZXUbYo8Xfcq h61u2eWhfdWsP7BfjDZmKnWDp83+B8XUHsUJGu50DEWInrU5MLA8CBmYM94kg4hLsFUj U0rdnnAJ35H31YsEl+6DWB8vB4hphiER0tF4dOBejqRrxMmgs4XCUuKusV0XcRD++oMZ YXjUOWDZF9xVczo2D5GJppgYrx9lGk+U4yzKvzYPdwkOR5ZCyqHV9cJ3aEh08ijc8PyD Rw+g== X-Gm-Message-State: AOJu0Yy8qlCOhDiNjjSJy25Yw8Z7DYtyHkr5MWkdHuDZf1MP2ivl+jjY OTkuyX0w3c+9NZYl4es5hyLzGiBzn5Mw1A== X-Google-Smtp-Source: AGHT+IH0eP4njNhQyV4JD1nw9nkmsGS1C+PGR76fYCaI5DP1YtBHzWttLuU0q1KlOy+VBJ1RvMwkmQ== X-Received: by 2002:ac8:5781:0:b0:405:466e:a63b with SMTP id v1-20020ac85781000000b00405466ea63bmr4627653qta.9.1692382640187; Fri, 18 Aug 2023 11:17:20 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-124-239.b2b2c.ca. [205.233.124.239]) by smtp.gmail.com with ESMTPSA id z5-20020ac84305000000b00403e80cad67sm687678qtm.41.2023.08.18.11.17.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Aug 2023 11:17:19 -0700 (PDT) From: Maxim Cournoyer Date: Fri, 18 Aug 2023 14:13:01 -0400 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches (%jami-version): Update to 20230619.1. * gnu/packages/jami.scm (%jami-sources): Update hash. Apply jami-qml-tests-discovery.patch patch. (libjami) [inputs]: Replace dbus-c++ with sdbus-c++. (jami) [arguments]: Delete obsolete change-directory/maybe phase. Adjust check phase. * gnu/packages/patches/jami-qml-tests-discovery.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. --- gnu/local.mk | 1 + gnu/packages/jami.scm | 34 ++++++------------- .../patches/jami-qml-tests-discovery.patch | 15 ++++++++ 3 files changed, 27 insertions(+), 23 deletions(-) create mode 100644 gnu/packages/patches/jami-qml-tests-discovery.patch diff --git a/gnu/local.mk b/gnu/local.mk index de669c1177..ac6ccc2ab2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1412,6 +1412,7 @@ dist_patch_DATA = \ %D%/packages/patches/isync-openssl3-fix.patch \ %D%/packages/patches/itk-snap-alt-glibc-compat.patch \ %D%/packages/patches/jami-disable-integration-tests.patch \ + %D%/packages/patches/jami-qml-tests-discovery.patch \ %D%/packages/patches/jami-libjami-headers-search.patch \ %D%/packages/patches/jamvm-1.5.1-aarch64-support.patch \ %D%/packages/patches/jamvm-1.5.1-armv7-support.patch \ diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index db120f223e..07c25a0601 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -68,7 +68,7 @@ (define-module (gnu packages jami) #:use-module (guix packages) #:use-module (guix utils)) -(define %jami-version "20230323.0") +(define %jami-version "20230619.1") (define %jami-sources ;; Return an origin object of the tarball release sources archive of the @@ -85,9 +85,10 @@ (define %jami-sources '(delete-file-recursively "daemon/contrib/tarballs")) (sha256 (base32 - "0vjsjr37cb87j9hqbmipyxn4877k1wn3l0vzca3l3ldgknglz7v2")) + "0qb8jvgsqak1hbhkksxj2cxkcy6mb46zl904lwhxfgr5992pl33z")) (patches (search-patches "jami-disable-integration-tests.patch" - "jami-libjami-headers-search.patch")))) + "jami-libjami-headers-search.patch" + "jami-qml-tests-discovery.patch")))) ;; Jami maintains a set of patches for some key dependencies (currently ;; pjproject and ffmpeg) of Jami that haven't yet been integrated upstream. @@ -409,7 +410,6 @@ (define-public libjami (inputs (list alsa-lib asio - dbus-c++ eudev ffmpeg-jami guile-3.0 @@ -424,6 +424,7 @@ (define-public libjami openssl pjproject-jami pulseaudio + sdbus-c++ speex speexdsp webrtc-audio-processing @@ -467,11 +468,7 @@ (define-public jami "-DENABLE_LIBWRAP=ON") #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'change-directory/maybe - (lambda _ - ;; Allow building from the tarball or a git checkout. - (false-if-exception (chdir "client-qt")))) - (add-after 'change-directory/maybe 'fix-version-string + (add-after 'unpack 'fix-version-string (lambda _ (substitute* "src/app/version.h" (("VERSION_STRING") @@ -488,22 +485,13 @@ (define-public jami ;; The tests require a writable HOME. (setenv "HOME" "/tmp") - (display "Running unittests...\n") - (invoke "tests/unittests" "-mutejamid") + (display "Running unit tests...\n") + (invoke "tests/unit_tests") - ;; XXX: There are currently multiple failures with the - ;; functional tests (see: - ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/883), - ;; so the code below is disabled for now. - ;; + ;; XXX: The QML test suite fails, exiting with status code 1 (see: + ;; https://git.jami.net/savoirfairelinux/jami-client-qt/-/issues/883). ;; (display "Running functional tests...\n") - ;; ;; This is to allow building from the source tarball or - ;; ;; directly from the git repository. - ;; (let ((tests-qml (if (file-exists? "../client-qt/tests") - ;; "../client-qt/tests/qml" - ;; "../tests/qml"))) - ;; (invoke "tests/qml_tests" "-mutejamid" - ;; "-input" tests-qml)) + ;; (invoke "tests/qml_tests") )))))) (native-inputs (list googletest diff --git a/gnu/packages/patches/jami-qml-tests-discovery.patch b/gnu/packages/patches/jami-qml-tests-discovery.patch new file mode 100644 index 0000000000..11fd69571c --- /dev/null +++ b/gnu/packages/patches/jami-qml-tests-discovery.patch @@ -0,0 +1,15 @@ +Upstream status: https://review.jami.net/c/jami-client-qt/+/25640 + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index d50908cf..587c9d15 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -73,6 +73,8 @@ endif() + + string(TOUPPER ${CMAKE_BUILD_TYPE} BUILD_TYPE) + ++set(QUICK_TEST_SOURCE_DIR "${CMAKE_SOURCE_DIR}tests/qml/src") ++ + set(QML_TESTS_SOURCE_FILES + ${CMAKE_SOURCE_DIR}/tests/qml/main.cpp + ${TEST_QML_RESOURCES}