From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id ULZeCU8k32KrsAAAbAwnHQ (envelope-from ) for ; Tue, 26 Jul 2022 01:16:31 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aICQCU8k32IxVQAA9RJhRA (envelope-from ) for ; Tue, 26 Jul 2022 01:16:31 +0200 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B89C72F7CA for ; Tue, 26 Jul 2022 01:16:30 +0200 (CEST) Received: from localhost ([::1]:39910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oG7JN-0002Q8-Da for larch@yhetil.org; Mon, 25 Jul 2022 19:16:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37892) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oG7Ix-0001yb-FM for guix-patches@gnu.org; Mon, 25 Jul 2022 19:16:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:33766) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1oG7Ix-0006ji-1I for guix-patches@gnu.org; Mon, 25 Jul 2022 19:16:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1oG7Iw-0000UG-Tp for guix-patches@gnu.org; Mon, 25 Jul 2022 19:16:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#56771] [PATCH 33/33] gnu: jami: Update to 20220725.1128.fd5e6c6. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Jul 2022 23:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 56771 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 56771@debbugs.gnu.org Cc: Maxim Cournoyer Received: via spool by 56771-submit@debbugs.gnu.org id=B56771.16587909341789 (code B ref 56771); Mon, 25 Jul 2022 23:16:02 +0000 Received: (at 56771) by debbugs.gnu.org; 25 Jul 2022 23:15:34 +0000 Received: from localhost ([127.0.0.1]:51743 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7IU-0000Sk-31 for submit@debbugs.gnu.org; Mon, 25 Jul 2022 19:15:34 -0400 Received: from mail-io1-f46.google.com ([209.85.166.46]:38753) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1oG7IR-0000SW-MH for 56771@debbugs.gnu.org; Mon, 25 Jul 2022 19:15:32 -0400 Received: by mail-io1-f46.google.com with SMTP id e69so10039053iof.5 for <56771@debbugs.gnu.org>; Mon, 25 Jul 2022 16:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=hjLDkTC5TbdQgLseM+c5HuhO2VsW9AeI4ldzjsUwAfQ=; b=VN62drKNBavRZ3dFvsMsCvoeNtxt2gN7aUo8DZssXzQ1FaLjizmprrvGU0Da2PDjeo vE7m0USOalI74gShji6dEsvtbyUUzjm5l6GYkWLIhnSTTuyGs2sAZon19pB/P8/1L5VY sRViKJlaLRlq8v/VSRReFYciyLzCOYcex728AIU+feLV6ystaEXSYpJ5mZKCcDnLd0vu LonzAjsgXYRkwiMSAEl/Nktgmb53+FZSlNrNCNgORKSo7Y63RIam6vTmbq2tA8lM3G6P pWlggfjKdePrp0NdX08UIKusuKU5VGJ7WB8i7q/9j5Qau8Y543Bgi9CQZHVPUI5zyRkZ FmdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hjLDkTC5TbdQgLseM+c5HuhO2VsW9AeI4ldzjsUwAfQ=; b=eND2lHUPpXOUMmaLkfEOU5yZKMog/1l9x4ZeWefcCwcShWoremalg48upQyILLK4lF ttkL/UW3nhzeoWqSfEREzYSpq4b72C/uI+W3V27A1BjMuh/zBxSYpxhzmq8ZdMMoCemi Ej6YSOEx2nGZ3duKtEYii9V+Zl4CTEiWV6p/m0jOhT4J2QpA1mstXSxATDCBJcyIXoft L0CKwzfYpfZKZ/UrSC+IOCJxTaESy7UUI23/2Fl4xlkn32TB0iofkLHwzok7hvbRKh5e RFrZRjfXQrTas7mO4/AULXpvhNPP5Bfq+c15e3PViNYbBshxbxDgRkkodc8qPR2mL5BB pWhA== X-Gm-Message-State: AJIora9yysOHM0bk1fIj9hmciGSHqxWpvqRiN+KpLmLjVvnGbV2jrEng NXiXvhst46o9btYmtTn5fN+m67+v9y0= X-Google-Smtp-Source: AGRyM1t85fDsAO0PNeK6U3SJvcx7Il5xaQFKyaQ8xlFYvhe2PEYTLPgVlQ12ogHspNja5mvbe1qBzg== X-Received: by 2002:a05:620a:25cc:b0:6b6:4ba3:24cc with SMTP id y12-20020a05620a25cc00b006b64ba324ccmr7937649qko.367.1658790521057; Mon, 25 Jul 2022 16:08:41 -0700 (PDT) Received: from localhost.localdomain (dsl-205-233-125-69.b2b2c.ca. [205.233.125.69]) by smtp.gmail.com with ESMTPSA id c15-20020ac8008f000000b0031ee9afafccsm8110580qtg.14.2022.07.25.16.08.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jul 2022 16:08:40 -0700 (PDT) From: Maxim Cournoyer Date: Mon, 25 Jul 2022 19:08:03 -0400 Message-Id: <20220725230803.10002-33-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220725230803.10002-1-maxim.cournoyer@gmail.com> References: <20220725230803.10002-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1658790990; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=hjLDkTC5TbdQgLseM+c5HuhO2VsW9AeI4ldzjsUwAfQ=; b=iGaUC6nIrQZ/XL1PFVYt9HpocYxOlcheoDvgk3eM2GTxgkiFM4k6GzkYHM4bnkbotfYEJx TKmU2oxpKoqY/CVTy7l8iER+l//NE6DZNCvgq8Law586qZGj90hGiPU+Ek+FYu6V0mqB82 ONchtktYU7/RtiLrgLOj9EGs6RScLo9KE2+TmAzJP2grdVMRytg1D4WYd4tueY0VslDv3o Drw59gxqtRJ66K9jceTBtfCnNIKFY/IBeBxkYi6FwwWv6GRp2Iyppb0DG4kU9e+j3SdWjN 4Y4N1NEpnMlyClhr0HbTny/zvBzbXUTGXTYJweEhSN7Mm30V+u4G77/YK6/rEg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1658790990; a=rsa-sha256; cv=none; b=WOulZknY1GWVevB118Z5322mltYSAvGrfgsHPNctu1wgyio2b+i9R881bJAgqX2nbyX5dr czEpXgcp0Yg4G84RhAx6WJNaYpJCYcs7zJWv2MkYLTgy19EhrT9p/mVSxaeXXg8X8M01+c yZNHYUQ9zQ7poXlhgh5XUwoaWzvWXr+44ipHRbNAobTqajiex1O0Ur84W+718PLBCrPS2D U7PgsT4qPuEGb/FjBjH6oOMh1Tkl3SabxfQ5nxQbQp3kAYrL96RwwJL9uKGMg++mAyxhTq mvawWsfX8DNxvGPKugYv4sdT8CmDulTsFRx3HFEKPOvRGfyj4yi5b0tCGa2G7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=VN62drKN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: 4.67 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b=VN62drKN; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: B89C72F7CA X-Spam-Score: 4.67 X-Migadu-Scanner: scn0.migadu.com X-TUID: BzrsOeEATCcE * gnu/packages/jami.scm (jami): Update to 20220725.1128.fd5e6c6. [configure-flags]: New argument. [phases]{fix-version-string}: Adjust file name. {use-desktop-opengl}: Delete obsolete phase. {patch-source}: New phase. [native-inputs]: Add googletest and vulkan-headers. Replace qttools-5 with qttools. [inputs]: Add libxkbcommon, qt5compat, qtnetworkauth, qtpositioning and vulkan-loader. Remove qtwebengine-5, qtwebchannel-5, qtgraphicaleffects, qtquickcontrols-5 and qtquickcontrols2-5. Update qtsvg-5, qtmultimedia-5 and qtdeclarative-5 to their Qt 6 equivalent. --- gnu/packages/jami.scm | 91 +++++++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 33 deletions(-) diff --git a/gnu/packages/jami.scm b/gnu/packages/jami.scm index 71d5313181..b3539e7d5c 100644 --- a/gnu/packages/jami.scm +++ b/gnu/packages/jami.scm @@ -482,43 +482,68 @@ (define-public jami (build-system qt-build-system) (outputs '("out" "debug")) (arguments - `(#:tests? #f ;no test suite - #: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 - (lambda _ - (substitute* "src/version.h" - (("VERSION_STRING") - "BUILD_DATE") ;to avoid a redefinition error - (("// clang-format on.*" anchor) - (string-append "const char VERSION_STRING[] = \"" - ,version "\";\n" - anchor))))) - (add-after 'change-directory/maybe 'use-desktop-opengl - ;; TODO: Remove after next release; this is no longer specified in - ;; the source following the update to Qt 6. - (lambda _ - (substitute* "src/main.cpp" - (("Qt::AA_UseOpenGLES") - "Qt::AA_UseDesktopOpenGL"))))))) + (list + #:qtbase qtbase + #:tests? #f ;see comment below + #:configure-flags + ;; The test suite fails to build with: + ;; "../../../client-qt/src/app/utils.h:29:10: fatal error: QLabel: No + ;; such file or directory". + #~(list "-DENABLE_TESTS=OFF" + "-DWITH_WEBENGINE=OFF" ;reduce transitive closure size by 450 MiB + ;; Use libwrap to link directly to libjami instead of + ;; communicating via D-Bus to jamid, the Jami daemon. + "-DENABLE_LIBWRAP=ON" + (string-append "-DLIBJAMI_XML_INTERFACES_DIR=" + #$(this-package-input "libjami") + "/share/dbus-1/interfaces") + (string-append "-DLIBJAMI_INCLUDE_DIR=" + #$(this-package-input "libjami") "/include/jami")) + #: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 + (lambda _ + (substitute* "src/app/version.h" + (("VERSION_STRING") + "BUILD_DATE") ;to avoid a redefinition error + (("// clang-format on.*" anchor) + (string-append "const char VERSION_STRING[] = \"" + #$version "\";\n" + anchor))))) + (add-after 'change-directory/maybe 'patch-source + (lambda _ + (substitute* "src/libclient/CMakeLists.txt" + ;; Fix submitted upstream (see: + ;; https://review.jami.net/c/jami-client-qt/+/21830). + (("target_link_libraries\\(\\$\\{LIBCLIENT_NAME} qtwrapper.*" all) + (string-append + all " target_link_libraries(${LIBCLIENT_NAME} avutil)\n")))))))) (native-inputs - (list pkg-config python qttools-5 doxygen graphviz)) + (list googletest + pkg-config + python + qttools + doxygen + graphviz + vulkan-headers)) (inputs - (list libnotify + (list ffmpeg-jami + libjami + libnotify + libxkbcommon network-manager qrencode - qtsvg-5 - qtwebengine-5 - qtwebchannel-5 - qtmultimedia-5 - qtdeclarative-5 - qtgraphicaleffects - qtquickcontrols-5 - qtquickcontrols2-5)) + qt5compat + qtdeclarative + qtmultimedia + qtnetworkauth + qtpositioning + qtsvg + vulkan-loader)) (home-page "https://jami.net") (synopsis "Qt Jami client") (description "This package provides the Jami Qt client. Jami is a secure -- 2.36.1