From patchwork Sun Oct 29 11:04:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55576 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 964F327BBE9; Sun, 29 Oct 2023 20:23:41 +0000 (GMT) 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_INVALID, DKIM_SIGNED,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 89F9927BBE2 for ; Sun, 29 Oct 2023 20:23:39 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxCJn-0006G4-C3; Sun, 29 Oct 2023 16:23:31 -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 1qxCJl-0006Fv-Pm for guix-patches@gnu.org; Sun, 29 Oct 2023 16:23:29 -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 1qxCJl-0006lA-HH for guix-patches@gnu.org; Sun, 29 Oct 2023 16:23:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxCKI-0002Qw-7U for guix-patches@gnu.org; Sun, 29 Oct 2023 16:24:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 29 Oct 2023 20:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66823 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Liliana Marie Prikler Cc: rg@raghavgururajan.name, maxim.cournoyer@gmail.com, 66823@debbugs.gnu.org Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.16986109839255 (code B ref 66823); Sun, 29 Oct 2023 20:24:02 +0000 Received: (at 66823) by debbugs.gnu.org; 29 Oct 2023 20:23:03 +0000 Received: from localhost ([127.0.0.1]:43444 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxCJK-0002Oz-BB for submit@debbugs.gnu.org; Sun, 29 Oct 2023 16:23:02 -0400 Received: from planete-kraus.eu ([89.234.140.182]:36970) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxCJI-0002OV-QL for 66823@debbugs.gnu.org; Sun, 29 Oct 2023 16:23:01 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 1709d577; Sun, 29 Oct 2023 20:22:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=planete-kraus.eu; h= message-id:in-reply-to:references:from:date:subject:to:cc :mime-version; s=albinoniB; bh=AfTWUsAvzxTnBbtqjB3JjIuAMy0=; b=o dMb0PWdGoLRZ3tTuhBVnb5kuoxKzdPi2hghi81sMCdhU1dt7B8PqhOaM05pzd4Ib sHKqavDd8Wlnq0bEO5/osMrqiO3F2xZkWeH0UGS6dkrCQi/JLOuxDF0RN5zkFvqX BIJyZpmCq37sWaMYN0JNYcu/V9/jj4TBqJrRd4W+WQKUcpwR4x0bQDmoS8XwvNZS U9/ViAFh6WbCG+wW1q+WHa7ed2Ab5xXFSz/BZ3AAX2vr1OYUXE1daBwMGLEciYQa L78Xx9Kfm0Em/P8VYGYKIyEa7hNOUlHQ2uqugDESctr1mCCrsFX8acd/Jb1v9csE hlWtpjJEbwB82UzHXG/OQ== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ddfd4982 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Sun, 29 Oct 2023 20:22:27 +0000 (UTC) Message-ID: <74fad47a944648bcd9a2fcf03bb2635cef799d03.1698610511.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Sun, 29 Oct 2023 12:04:57 +0100 MIME-Version: 1.0 User-Agent: Evolution 3.46.4 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: , Reply-to: Vivien Kraus X-ACL-Warn: , Vivien Kraus via Guix-patches X-Patchwork-Original-From: Vivien Kraus via Guix-patches via From: Vivien Kraus 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 * gnu/packages/gnome.scm (libcallaudio): New variable. * gnu/packages/patches/call-disable-application-test.patch: New file. * gnu/packages/patches/call-disable-sip-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them here. Change-Id: I6f0485e4c73536c576713005cf7cd74610923a21 --- gnu/local.mk | 2 + gnu/packages/gnome.scm | 61 ++++++++++++++++ .../call-disable-application-test.patch | 71 +++++++++++++++++++ .../patches/call-disable-sip-test.patch | 39 ++++++++++ 4 files changed, 173 insertions(+) create mode 100644 gnu/packages/patches/call-disable-application-test.patch create mode 100644 gnu/packages/patches/call-disable-sip-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 050cb71ef9..f032bba260 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -989,6 +989,8 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ + %D%/packages/patches/call-disable-application-test.patch \ + %D%/packages/patches/call-disable-sip-test.patch \ %D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/ccextractor-add-missing-header.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 19816dbc4e..219d994ce4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13519,3 +13519,64 @@ (define-public libcall-ui (description "This package provides common user interfaces to make and receive calls.") (home-page "https://gitlab.gnome.org/World/Phosh/libcall-ui") (license license:lgpl2.1+))) + +(define-public calls + (package + (name "calls") + (version "45.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1mvnrm5wbl69xbcjg8nxd6l6nj2fd3whbyh70axlm75c7l7d5j5r")) + (patches + (search-patches "call-disable-application-test.patch" + "call-disable-sip-test.patch")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:configure-flags #~'("-Dgtk_doc=true") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))))) + (inputs + (list evolution-data-server + feedbackd + folks + glib + gom + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gtk+ + libcall-ui + libgee + libpeas + libhandy + modem-manager + (@ (gnu packages telephony) sofia-sip))) + (native-inputs + (list desktop-file-utils ; update-desktop-database + gettext-minimal + `(,glib "bin") ; glib-mkenums + gtk-doc ; gtkdoc-scan + `(,gtk+ "bin") ; gtk-update-icon-cache + pkg-config + python-docutils ; rst2man + vala + xorg-server-for-tests)) + (home-page "https://gitlab.gnome.org/GNOME/calls") + (synopsis "Phone dialer and call handler") + (description "Calls can make and answer phone calls using different backends, such as +ModemManager for phones and SIP for VoIP.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/call-disable-application-test.patch b/gnu/packages/patches/call-disable-application-test.patch new file mode 100644 index 0000000000..ddd6d2a328 --- /dev/null +++ b/gnu/packages/patches/call-disable-application-test.patch @@ -0,0 +1,71 @@ +From e0fdae20840ffe3aeca7190eb8b1bcae70f0c93b Mon Sep 17 00:00:00 2001 +From: Vivien Kraus +Date: Sun, 29 Oct 2023 21:03:27 +0100 +Subject: [PATCH] Disable the application test. + +The application test does not work in a Guix container. + +* tests/meson.build: Disable test-application. +--- + tests/meson.build | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index c9bdc3d..65f9b93 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -165,24 +165,24 @@ test('dbus', t, env: test_env) + + dbus_run_session = find_program('dbus-run-session') + +-if dbus_run_session.found () +- test_sources = [ 'test-application.c' ] +- t = executable('application', test_sources, calls_resources, +- c_args : test_cflags, +- link_args: test_link_args, +- pie: true, +- link_with : [calls_vala, libcalls], +- dependencies: calls_deps, +- include_directories : [ +- calls_includes, +- ] +- ) +- test('application', +- dbus_run_session, +- args: t.full_path(), +- env: test_env, +- timeout : 300 +- ) +-endif ++# if dbus_run_session.found () ++# test_sources = [ 'test-application.c' ] ++# t = executable('application', test_sources, calls_resources, ++# c_args : test_cflags, ++# link_args: test_link_args, ++# pie: true, ++# link_with : [calls_vala, libcalls], ++# dependencies: calls_deps, ++# include_directories : [ ++# calls_includes, ++# ] ++# ) ++# test('application', ++# dbus_run_session, ++# args: t.full_path(), ++# env: test_env, ++# timeout : 300 ++# ) ++# endif + + endif + +base-commit: 936d36287324163b958c6ea0c4297c7a607ee18c +prerequisite-patch-id: 20f8a81da35ce1797635eb310e1f85ac5ff814f6 +prerequisite-patch-id: 96768617d0a8ee8c66faa00220a1612e0f527292 +prerequisite-patch-id: 444c1ee57c24ba4b8165497b0a5885844110c59b +prerequisite-patch-id: 9415b848ca9ee277bccbad7c3fff23230d5016f1 +prerequisite-patch-id: 3ca2a45be430041875b21f6c8dfac0bc17916abf +prerequisite-patch-id: e8302846f4650dba9e0072c18be3459ce903fe2e +-- +2.41.0 + diff --git a/gnu/packages/patches/call-disable-sip-test.patch b/gnu/packages/patches/call-disable-sip-test.patch new file mode 100644 index 0000000000..de1b0ff7bf --- /dev/null +++ b/gnu/packages/patches/call-disable-sip-test.patch @@ -0,0 +1,39 @@ +From 33b75bfcda3437b12b6155addeeddcea697a4270 Mon Sep 17 00:00:00 2001 +Message-ID: <33b75bfcda3437b12b6155addeeddcea697a4270.1698608762.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Sun, 29 Oct 2023 20:45:24 +0100 +Subject: [PATCH] Disable the direct call SIP test. + +* plugins/provider/tests/test-sip.c (main): Disable it. +--- + plugins/provider/tests/test-sip.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/plugins/provider/tests/test-sip.c b/plugins/provider/tests/test-sip.c +index 185d372..4e83d40 100644 +--- a/plugins/provider/tests/test-sip.c ++++ b/plugins/provider/tests/test-sip.c +@@ -442,8 +442,11 @@ main (int argc, + g_test_add ("/Calls/SIP/origin_call_lists", SipFixture, NULL, + setup_sip_origins, test_sip_origin_call_lists, tear_down_sip_origins); + +- g_test_add ("/Calls/SIP/calls_direct_call", SipFixture, NULL, +- setup_sip_origins, test_sip_call_direct_calls, tear_down_sip_origins); ++ /* The direct call fails in the Guix build environment, possibly ++ * because the network is more restricted. */ ++ ++ /* g_test_add ("/Calls/SIP/calls_direct_call", SipFixture, NULL, ++ setup_sip_origins, test_sip_call_direct_calls, tear_down_sip_origins); */ + + ret = g_test_run (); + + +base-commit: 936d36287324163b958c6ea0c4297c7a607ee18c +prerequisite-patch-id: 20f8a81da35ce1797635eb310e1f85ac5ff814f6 +prerequisite-patch-id: 96768617d0a8ee8c66faa00220a1612e0f527292 +prerequisite-patch-id: 444c1ee57c24ba4b8165497b0a5885844110c59b +prerequisite-patch-id: 9415b848ca9ee277bccbad7c3fff23230d5016f1 +prerequisite-patch-id: 3ca2a45be430041875b21f6c8dfac0bc17916abf +-- +2.41.0 +