From patchwork Tue Oct 31 19:34:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55741 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 4C5BC27BBE9; Tue, 31 Oct 2023 19:41:01 +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 58FA927BBE2 for ; Tue, 31 Oct 2023 19:40:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxubG-0003UC-Dc; Tue, 31 Oct 2023 15:40:30 -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 1qxubF-0003Tj-Nw for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40: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 1qxubF-0005X9-Fe for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxubn-0005vF-CG for guix-patches@gnu.org; Tue, 31 Oct 2023 15:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v3 1/6] gnu: Add gmobile. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Oct 2023 19:41:03 +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: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 66823@debbugs.gnu.org Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.169878124722685 (code B ref 66823); Tue, 31 Oct 2023 19:41:03 +0000 Received: (at 66823) by debbugs.gnu.org; 31 Oct 2023 19:40:47 +0000 Received: from localhost ([127.0.0.1]:49203 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubX-0005tj-7y for submit@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:47 -0400 Received: from planete-kraus.eu ([89.234.140.182]:41906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubT-0005sx-Bc for 66823@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:44 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id f041c002; Tue, 31 Oct 2023 19:40:08 +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=sFE9P0Q2MymdF0BE41muts1epZ8=; b=V N73cocfhNlRhdvUBlcZV23LjCgRP7ygiEcPoGfnPllliv+HaOY+170fJD/DrXBYz cpo6pYBUilC3buz0wOPgQV3BLN0rFiHRgfnzwIbaSX2SWa04butz6oyvIo6aQ6JH eIjt0fW5tey+eRt+J1YC2RtuFrWBvAHVf/TpunhyGL9mLZ4ox83qSgC1epVdczkl hhvZpBDwviKume/niGd9E6auscdZT36plefNfzE8QZHppKSRxwiu6vSewnZ7Li+R QvQKP8BTweWDluLXCmdO8mtzhx9i5jGosRTiYPAAEtlM5W7drID8YTG3Lg8rbL1o R/a6ZskrmrHQHrwiI3Bfg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 94969dfb (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 31 Oct 2023 19:40:07 +0000 (UTC) Message-ID: <1d51f25a67de63af638c1a5fae763fc2f06ff9a8.1698780970.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Tue, 31 Oct 2023 20:34:25 +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 (gmobile): New variable. * gnu/packages/patches/gmobile-make-it-installable.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. Change-Id: If36413dfa1ee1e6156f2652fa86282283b592b36 --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 27 ++++++ .../patches/gmobile-make-it-installable.patch | 89 +++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 gnu/packages/patches/gmobile-make-it-installable.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9befa202ad..92b56289f2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1318,6 +1318,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glslang-install-static-libs.patch \ + %D%/packages/patches/gmobile-make-it-installable.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a86ddc34b3..0933bf7d34 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12915,6 +12915,33 @@ (define-public jsonrpc-glib host to avoid parser overhead and memory-allocator fragmentation.") (license license:lgpl2.1+))) +(define-public gmobile + (package + (name "gmobile") + (version "0.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/guidog/gmobile") + (commit (string-append "v" version)))) + (file-name (git-file-name "gmobile" version)) + (sha256 + (base32 + "0lr22nj4ypzxbjim1a7ay07nh4vx3dqc895qql437gda6x0rvn2p")) + (patches + (search-patches "gmobile-make-it-installable.patch")))) + (build-system meson-build-system) + (native-inputs + (list `(,glib "bin") ; for glib-compile-resources + pkg-config)) + (propagated-inputs + (list glib json-glib)) + (synopsis "Functions useful in mobile related, glib based projects") + (description "This package provides functions for mobiles.") + (home-page "https://gitlab.gnome.org/guidog/gmobile") + (license license:lgpl2.1+))) + (define-public feedbackd (package (name "feedbackd") diff --git a/gnu/packages/patches/gmobile-make-it-installable.patch b/gnu/packages/patches/gmobile-make-it-installable.patch new file mode 100644 index 0000000000..9db6554877 --- /dev/null +++ b/gnu/packages/patches/gmobile-make-it-installable.patch @@ -0,0 +1,89 @@ +From c1ea43a45f4588f21752b0ad679c43350a9c8905 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Vivien Kraus +Date: Sun, 29 Oct 2023 19:00:44 +0100 +Subject: [PATCH] Install gmobile as a shared library. + +Tracked at https://gitlab.gnome.org/guidog/gmobile/-/issues/1 + +* src/meson.build: Install the header files. Import pkgconfig. +Generate a pkg-config definition. +(gm_lib): use "library", not "static_library". Install it. +(gmobile_gir): Install it. +* meson.build: Install gm-config.h. +--- + meson.build | 1 + + src/meson.build | 22 +++++++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index e9f6c62..51ebeac 100644 +--- a/meson.build ++++ b/meson.build +@@ -83,6 +83,7 @@ root_inc = include_directories('.') + configure_file( + output: 'gm-config.h', + configuration: config_h, ++ install_dir: get_option('includedir') + ) + + subdir('data') +diff --git a/src/meson.build b/src/meson.build +index ee98a39..3dedbe4 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,3 +1,5 @@ ++pkg = import('pkgconfig') ++ + gm_deps = [ + gio_dep, + glib_dep, +@@ -37,18 +39,33 @@ gm_c_args = [ + '-DG_LOG_DOMAIN="gmobile"', + ] + +-gm_lib = static_library( ++gm_lib = library( + 'gmobile', + gm_sources, + include_directories: root_inc, + c_args: gm_c_args, +- dependencies: gm_deps) ++ dependencies: gm_deps, ++ install: true) ++ ++pkg.generate(gm_lib) + + gmobile_dep = declare_dependency( + include_directories: [root_inc, include_directories('.')], + dependencies: gm_deps, + link_with: gm_lib) + ++install_headers( ++ 'gmobile.h', ++ 'gm-cutout.h', ++ 'gm-device-info.h', ++ 'gm-device-tree.h', ++ 'gm-display-panel.h', ++ 'gm-error.h', ++ 'gm-main.h', ++ 'gm-rect.h', ++ 'gm-svg-path.h', ++ 'gm-timeout.h') ++ + if get_option('gtk_doc') + gmobile_gir_extra_args = [ + '--c-include=gmobile.h', +@@ -66,7 +83,6 @@ if get_option('gtk_doc') + identifier_prefix: 'Gm', + link_with: gm_lib, + includes: ['Gio-2.0'], +- install: false, + extra_args: gmobile_gir_extra_args, + ) + endif + +base-commit: 382fc89472176d2f1d435517cad53d969d8b8eff +-- +2.41.0 + From patchwork Tue Oct 31 19:34:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55742 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 78F8627BBE2; Tue, 31 Oct 2023 19:41:04 +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=ham 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 7A0BA27BBEA for ; Tue, 31 Oct 2023 19:40:56 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxubH-0003VK-9J; Tue, 31 Oct 2023 15:40: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 1qxubF-0003TL-Fi for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40: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 1qxubF-0005Wt-7J for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxubm-0005uz-FV for guix-patches@gnu.org; Tue, 31 Oct 2023 15:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v3 2/6] gnu: feedbackd: Update to 0.2.1. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Oct 2023 19:41: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: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 66823@debbugs.gnu.org Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.169878124122658 (code B ref 66823); Tue, 31 Oct 2023 19:41:02 +0000 Received: (at 66823) by debbugs.gnu.org; 31 Oct 2023 19:40:41 +0000 Received: from localhost ([127.0.0.1]:49198 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubQ-0005tO-Qn for submit@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:41 -0400 Received: from planete-kraus.eu ([89.234.140.182]:41906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubL-0005sx-5U for 66823@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:38 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id f24f83b1; Tue, 31 Oct 2023 19:39:58 +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=IuBai4t0WCLVww7/3jdLOxr3AEM=; b=G TqGxodZQDjtZ8xUgEHFyI8S0Y208jomQP4CjnAsmDKufVajYPukxBA3f59Jad0oq DNVLfzYPeGLDQdympiG6/HqXyX14p6+ofOUZe1quYFukJqUf4f7LER3ft+IpOGqK rXbFnAvFxfChjP35OEmU0Eq+jnhn9uUxARpCSlcJLyyWmKlHY5Ajf2HDfjTuuSyI kBC/nlKZ6U/CqRvAZBQ1GGzdXpRicEqXfWNZGDbaVX0MCe3PU4HU6wkt9xx83zsq aSOJfaqqImhRl1hpCX/r0oEZLO5zWFYUEKjq0MHjQkyI9xFlIWIDKzJ4vPPkgJhK Wxt+E50NGMIi3/kxy4zyg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id f47cb6d3 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 31 Oct 2023 19:39:58 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Tue, 31 Oct 2023 20:34:35 +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 (feedbackd): Update to 0.2.1. [#:phases]: Add 'unpack-gmobile. (inputs): Add gmobile. * gnu/packages/patches/feedbackd-use-system-gmobile.patch: New file. * gnu/packages/gnome.scm (feedbackd) [patches]: Use it here. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/gnome.scm (feedbackd) [snippet]: Remove the gmobile submodule. Change-Id: I06521c1673efb6aea1d163410fdf3d0206b57d8a --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 12 ++++-- .../feedbackd-use-system-gmobile.patch | 40 +++++++++++++++++++ 3 files changed, 50 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch diff --git a/gnu/local.mk b/gnu/local.mk index 92b56289f2..fc3e36fc18 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1155,6 +1155,7 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fbreader-curl-7.62.patch \ %D%/packages/patches/fbreader-fix-icon.patch \ + %D%/packages/patches/feedbackd-use-system-gmobile.patch \ %D%/packages/patches/fenics-dolfin-algorithm.patch \ %D%/packages/patches/fenics-dolfin-demo-init.patch \ %D%/packages/patches/fenics-dolfin-boost.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0933bf7d34..8159d0d792 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12945,7 +12945,7 @@ (define-public gmobile (define-public feedbackd (package (name "feedbackd") - (version "0.0.0+git20200527") + (version "0.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -12954,12 +12954,18 @@ (define-public feedbackd (file-name (git-file-name name version)) (sha256 (base32 - "1wbkzxnqjydfgjvp7vz4ghczcz740zcb1yn90cb6gb5md4n6qx2y")))) + "1acwpb8cgzyvzriphrb42k3d7njwcn88j66i5wz75yx2sbfaf93q")) + (patches + (search-patches "feedbackd-use-system-gmobile.patch")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "subprojects"))))) (build-system meson-build-system) (native-inputs (list `(,glib "bin") gobject-introspection pkg-config vala)) (inputs - (list dbus gsound json-glib libgudev)) + (list dbus gmobile gsound json-glib libgudev)) (propagated-inputs (list glib)) ; in Requires of libfeedback-0.0.pc (synopsis "Haptic/visual/audio feedback via DBus") diff --git a/gnu/packages/patches/feedbackd-use-system-gmobile.patch b/gnu/packages/patches/feedbackd-use-system-gmobile.patch new file mode 100644 index 0000000000..206a7c57ec --- /dev/null +++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch @@ -0,0 +1,40 @@ +From af9e72124b12ca481fd3592f9c8ea2649f7e4c80 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Vivien Kraus +Date: Sun, 29 Oct 2023 19:12:27 +0100 +Subject: [PATCH] Look for a system-installed gmobile first. + +Meson lets projects use a dependency with fallback to a submodule, in +case the dependency is not installed. + +* meson.build (gmobile_subp): Convert to a dependency with subproject +fallback. +--- + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 8725e76..e5504be 100644 +--- a/meson.build ++++ b/meson.build +@@ -14,13 +14,13 @@ gio_unix = dependency('gio-unix-2.0', version: '>=2.50.0') + glib = dependency('glib-2.0', version: '>=2.50.0') + if get_option('daemon') + gobject = dependency('gobject-2.0', version: '>=2.50.0') +- gmobile_subp = subproject('gmobile', ++ gmobile = dependency('gmobile', ++ fallback: ['gmobile', 'gmobile_dep'], + default_options: [ + 'examples=false', + 'gtk_doc=false', + 'tests=false', + ]) +- gmobile = gmobile_subp.get_variable('gmobile_dep') + gsound = dependency('gsound') + gudev = dependency('gudev-1.0', version: '>=232') + json_glib = dependency('json-glib-1.0') + +base-commit: 853bd6d7ea8455efea063ba7c4f29ce8c203285f +-- +2.41.0 + From patchwork Tue Oct 31 19:34:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55739 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 B9B4A27BBE2; Tue, 31 Oct 2023 19:40:48 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 954B027BBE2 for ; Tue, 31 Oct 2023 19:40:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxubH-0003VY-GZ; Tue, 31 Oct 2023 15:40: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 1qxubG-0003UI-Jh for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40:30 -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 1qxubG-0005XZ-BM for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40:30 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxubo-0005vV-7e for guix-patches@gnu.org; Tue, 31 Oct 2023 15:41:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v3 3/6] gnu: Add sofia-sip. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Oct 2023 19:41:04 +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: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 66823@debbugs.gnu.org Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.169878126122730 (code B ref 66823); Tue, 31 Oct 2023 19:41:04 +0000 Received: (at 66823) by debbugs.gnu.org; 31 Oct 2023 19:41:01 +0000 Received: from localhost ([127.0.0.1]:49210 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubj-0005uV-8M for submit@debbugs.gnu.org; Tue, 31 Oct 2023 15:41:00 -0400 Received: from planete-kraus.eu ([89.234.140.182]:41906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubd-0005sx-Bm for 66823@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:55 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id f45f7b6c; Tue, 31 Oct 2023 19:40:18 +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=H8/gDcXmJZg06MIq1rNf74FTT0c=; b=S WdGD5FEy0aV+0sUGWYcoSFAH5Qu5WRB/Myw3zi722ECbBgIyWKInhia2XsPgGvYW D80vS252FnKabr8ggDVJdOXdHXs8Y8u4arQuugVQ3Mxuq7Rqsi2UkgyYznJ5tef+ ORHPCAVDxhS59U4wA/TkdxToy51LbL8WW3n4nBqH6MzpzMNB9aTyjtX7e5bUUbY5 Mxa67dxtOTLAkDvWfUi9DBda0eNudcbbiWhZB/6dwMLui1mGQORYl5bUjx8RgLxF DPIpYIdoQRo/faxKm9fEhyQAEbvf+HA6RyrNDvwXJ37U6JH243j7Mmpn61FvOhSY 850D9hAWdSQQPO9b3+mqA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id 3827fe90 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 31 Oct 2023 19:40:17 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Tue, 31 Oct 2023 20:34:49 +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/telephony.scm (sofia-sip): New variable. Change-Id: I18dd31fa62f5cfe528d7558915135f17d49b798d --- gnu/packages/telephony.scm | 81 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 42158784ca..ff99b79ae4 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -51,6 +51,7 @@ (define-module (gnu packages telephony) #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages databases) #:use-module (gnu packages sqlite) @@ -1088,3 +1089,83 @@ (define-public sipp (license (list license:gpl2+ ; sipp's main license license:bsd-3 ; send_packets.c, send_packets.h license:zlib)))) ; md5.c, md5.h + +(define-public sofia-sip + (package + (name "sofia-sip") + (version "1.13.16") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freeswitch/sofia-sip") + (commit (string-append "v" version)))) + (file-name (git-file-name "sofia-sip" version)) + (sha256 + (base32 + "1hi9np49wcq91d1w93qi6by40qnr348hpzc2wkw3l955zh1n30lr")))) + (build-system gnu-build-system) + (arguments + (list + ;; run_addrinfo requires /etc/services for the 'echo' service. + #:make-flags #~'("XFAIL_TESTS = run_addrinfo" + ;; libsofia-sip-ua/nta/Makefile.am sets + ;; TESTS_ENVIRONMENT = $(SHELL), which is odd, because + ;; according to the Automake manual, it should be + ;; AM_TESTS_ENVIRONMENT, and it should end with a + ;; semicolon. + "TESTS_ENVIRONMENT = \ +export CHECK_NTA_VERBOSE=10; \ +export CHECK_NUA_VERBOSE=10; ") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-shebangs + (lambda _ + (patch-shebang "autogen.sh"))) + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; The test failures have been reported: + ;; https://github.com/freeswitch/sofia-sip/issues/234: + ;; run_test_nta is disabled because it fails randomly (not for a + ;; timeout-related reason). The test suite is otherwise very + ;; long, most tests backed by libcheck timeout even with a ×100 + ;; multiplier. The tests are disabled here rather than put to + ;; XFAIL_TESTS because it saves compilation time. + (substitute* "libsofia-sip-ua/nta/Makefile.am" + (("TESTS =") + "TESTS = run_test_nta_api\n# Disabled: ")) + (substitute* "libsofia-sip-ua/nua/Makefile.am" + (("TESTS \\+=") + "TESTS +=\n# Disabled: ")) + ;; The glib tests both wait forever without a timeout. + (substitute* "libsofia-sip-ua-glib/su-glib/Makefile.am" + (("TESTS =") + "TESTS =\n# Disabled: ")) + ;; Another timeout failing test: + (substitute* "tests/Makefile.am" + (("TESTS = test_nua") + "TESTS =")) + ;; This test fails for unknown reason: + (substitute* "tests/Makefile.am" + (("TESTS \\+= check_dlopen_sofia check_sofia") + "TESTS += check_dlopen_sofia"))))))) + (inputs + (list glib + openssl + zlib)) + (native-inputs + (list autoconf + autoconf-archive + automake + check + libtool + pkg-config)) + (home-page "https://sofia-sip.sourceforge.net/") + (synopsis "SIP user-agent library") + (description "Sofia-SIP is a @acronym{SIP, Session Initiation Protocol} +User-Agent library, compliant with the +@url{https://datatracker.ietf.org/doc/html/rfc3261, IETF RFC3261} +specification. It can be used as a building block for @acronym{SIP} client +software foruses such as @acronym{VoIP, Voice over @acronym{IP, Internet +Protocol}}, @acronym{IM, Instant Messaging}, and many other real-time and +person-to-person communication services.") + (license license:lgpl2.1))) From patchwork Tue Oct 31 19:34:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55740 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 6C51227BBE2; Tue, 31 Oct 2023 19:40:53 +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=ham 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 E751427BBEB for ; Tue, 31 Oct 2023 19:40:48 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxubH-0003Va-La; Tue, 31 Oct 2023 15:40: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 1qxubG-0003U4-4f for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40:30 -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 1qxubF-0005XL-Sw for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxubn-0005vM-PK for guix-patches@gnu.org; Tue, 31 Oct 2023 15:41:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v3 4/6] gnu: Add libcallaudio. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Oct 2023 19:41:03 +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: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 66823@debbugs.gnu.org Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.169878125422706 (code B ref 66823); Tue, 31 Oct 2023 19:41:03 +0000 Received: (at 66823) by debbugs.gnu.org; 31 Oct 2023 19:40:54 +0000 Received: from localhost ([127.0.0.1]:49207 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubd-0005u9-Rx for submit@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:54 -0400 Received: from planete-kraus.eu ([89.234.140.182]:41906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubZ-0005sx-Bd for 66823@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:49 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 197f3cce; Tue, 31 Oct 2023 19:40:14 +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=4MPAT5jDh3GqqgFpMaZ0Q9EyTdc=; b=L dJWzWiYszdEDx4B25k9xepWd5ud31Ynl+kXnn3YWIfsU0YRXYB9tLm6rcyd0CCA1 3TF8rZPMOpkQrapH64dGSNwQKV0mxoBGKMvMR9iASepatXCQ9S4tunWNkBWtozZI w76mc6yHwo/OEF3/xDTIIX61ArkgZZaBtFf7mgNrkzdtV8MMwAfvaK5WvLjI5DfX 3psEYrvhZUGohB2TaUoU7S45LrQRwOlP4xWzGkQ+TQkikn16pYa+4mwfuMcUBLoH Sx1zAGxTR8z+XYNn4DEC9WNSFGsGxIdgDbFYzr7EgTxIJ5jImtJumhZCn0UgjMWI 9tcpaVEZQOpfQWKF8u3Iw== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id ddc93ade (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 31 Oct 2023 19:40:13 +0000 (UTC) Message-ID: <59c821818e2cb3c70bb8e84b8c847cdfc010f8ed.1698780970.git.vivien@planete-kraus.eu> In-Reply-To: References: Date: Tue, 31 Oct 2023 20:34:54 +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/telephony.scm (libcallaudio): New variable. Change-Id: I41cfe14136858fe0b2a302a9ed8d624d44ad2a95 --- gnu/packages/telephony.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index ff99b79ae4..0297391946 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -95,6 +95,7 @@ (define-module (gnu packages telephony) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system qt)) (define-public phonesim @@ -1169,3 +1170,27 @@ (define-public sofia-sip Protocol}}, @acronym{IM, Instant Messaging}, and many other real-time and person-to-person communication services.") (license license:lgpl2.1))) + +(define-public libcallaudio + (package + (name "libcallaudio") + (version "0.1.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mobian1/callaudiod/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qnllb28101c2ss1k3iwr04gljfyjqmbla5csj6vkq1y63aagr9s")))) + (build-system meson-build-system) + (inputs (list alsa-lib glib pulseaudio)) + (native-inputs + (list `(,glib "bin") ;for gdbus-codegen + pkg-config)) + (home-page "https://gitlab.com/mobian1/callaudiod") + (synopsis "Library for audio routing during voice calls") + (description "This package provides @command{callaudiod}, a daemon to +route audio during phone calls, and a library.") + (license license:gpl3+))) From patchwork Tue Oct 31 19:35:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55743 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 1E27027BBE9; Tue, 31 Oct 2023 19:41:15 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 2905A27BBE2 for ; Tue, 31 Oct 2023 19:41:11 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxubH-0003V9-6l; Tue, 31 Oct 2023 15:40: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 1qxubF-0003TN-Fp for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40: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 1qxubF-0005Wv-6s for guix-patches@gnu.org; Tue, 31 Oct 2023 15:40:29 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxubm-0005v6-Rv for guix-patches@gnu.org; Tue, 31 Oct 2023 15:41:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v3 5/6] gnu: Add libcall-ui. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Oct 2023 19:41: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: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 66823@debbugs.gnu.org Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.169878124722678 (code B ref 66823); Tue, 31 Oct 2023 19:41:02 +0000 Received: (at 66823) by debbugs.gnu.org; 31 Oct 2023 19:40:47 +0000 Received: from localhost ([127.0.0.1]:49201 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubW-0005th-CH for submit@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:47 -0400 Received: from planete-kraus.eu ([89.234.140.182]:41906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubP-0005sx-60 for 66823@debbugs.gnu.org; Tue, 31 Oct 2023 15:40:40 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 63d7d7f9; Tue, 31 Oct 2023 19:40:04 +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=8hgqCFP5Ay06LJzLg4y+mExsbCY=; b=A 36dbgWMEoDgEpdNZ6UYEkgQ3saDhVX4cFzcykdISu2ZMUB9qiebe2XlQxiK8gTPa OUqYTj/1EFR87E/ww3maFpFvwM/nzPFAMPJqFVV5XfLWXBu3SBCFIiPDCHOS9Q7g XWMoZdB9HrCnDnHUf2QkFAhPtrwlq39PVnL7VVgV31R25klCrHTPPekCJ+Tv1yRV nFRrUDKi4kVBkGWfaspaUGC1m0B8v7GpnuJmcWWPzx4PeLYcCUp09sSiWkhkul+5 wbjwH4FM8z7jvH5PhbzaTnaTqUVrbWoblyoVl1yhgZFADPPzdfggkgLWT7IDvIn8 Wh2K3+mk2pexTuuRXsmhA== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id a0039892 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 31 Oct 2023 19:40:03 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Tue, 31 Oct 2023 20:35:00 +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 (libcall-ui): New variable. * gnu/packages/patches/libcall-ui-make-it-installable.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. Change-Id: I47c403d12c90f9371a8065d2d8d8e829225e5f0c --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 40 +++++++++ .../libcall-ui-make-it-installable.patch | 81 +++++++++++++++++++ 3 files changed, 122 insertions(+) create mode 100644 gnu/packages/patches/libcall-ui-make-it-installable.patch diff --git a/gnu/local.mk b/gnu/local.mk index fc3e36fc18..050cb71ef9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1475,6 +1475,7 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ + %D%/packages/patches/libcall-ui-make-it-installable.patch \ %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8159d0d792..19816dbc4e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13479,3 +13479,43 @@ (define-public xffm+ (home-page "http://xffm.org/") (license license:gpl3+) (properties '((upstream-name . "xffm"))))) + +(define-public libcall-ui + (package + (name "libcall-ui") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/Phosh/libcall-ui") + (commit "6798b38d4d66d069751151b3e9a202c6de8d7f3c"))) + (file-name (git-file-name "libcall-ui" version)) + (sha256 + (base32 + "0zfrxh77ag8garqj319amnxjcdyp3ig12dkxfkl6wbwn1mvyrwx8")) + (patches (search-patches "libcall-ui-make-it-installable.patch")))) + (build-system meson-build-system) + (arguments + (list + #: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")))))) + (propagated-inputs ; All these in call-ui.pc. + (list glib + gtk+ + (@ (gnu packages telephony) libcallaudio) + libhandy)) + (native-inputs + (list `(,glib "bin") ; glib-mkenums + pkg-config + xorg-server-for-tests)) + (synopsis "Common User Interfaces for call handling") + (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+))) diff --git a/gnu/packages/patches/libcall-ui-make-it-installable.patch b/gnu/packages/patches/libcall-ui-make-it-installable.patch new file mode 100644 index 0000000000..078422913d --- /dev/null +++ b/gnu/packages/patches/libcall-ui-make-it-installable.patch @@ -0,0 +1,81 @@ +From 1a79c18e85232a6f56a58ec99271b92d5b0e6dca Mon Sep 17 00:00:00 2001 +Message-ID: <1a79c18e85232a6f56a58ec99271b92d5b0e6dca.1698606228.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Sun, 29 Oct 2023 19:42:55 +0100 +Subject: [PATCH] Install libcall-ui. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Tracked at https://gitlab.gnome.org/World/Phosh/libcall-ui/-/issues/27 + +* src/meson.build: Require pkgconfig. Install a pkg-config +definition. Install the headers. +(call_ui_lib): Install it. Use “library”, not “static_library”. +* meson.build (config_h): Install the config.h file. +(call_ui_enum_sources): Install the header file. +--- + meson.build | 1 + + src/meson.build | 22 +++++++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 6d96178..80514ba 100644 +--- a/meson.build ++++ b/meson.build +@@ -93,6 +93,7 @@ configure_file( + input: 'cui-config.h.in', + output: 'cui-config.h', + configuration: config_h, ++ install_dir: get_option('includedir') + ) + + #subdir('data') +diff --git a/src/meson.build b/src/meson.build +index bdb347c..2f9fa0c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,7 +1,11 @@ ++pkg = import('pkgconfig') ++ + call_ui_enum_headers = files(['cui-call.h', + ]) + call_ui_enum_sources = gnome.mkenums_simple('cui-enums', +- sources : call_ui_enum_headers) ++ sources : call_ui_enum_headers, ++ install_header: true, ++ install_dir: get_option('includedir')) + + call_ui_resources = gnome.compile_resources( + 'cui-resources', +@@ -50,11 +54,23 @@ call_ui_c_args = [ + '-DG_LOG_DOMAIN="Cui"', + ] + +-call_ui_lib = static_library('call-ui', ++call_ui_lib = library('call-ui', + call_ui_sources, + c_args: call_ui_c_args, + include_directories: [ root_inc, src_inc ], +- dependencies: call_ui_deps) ++ dependencies: call_ui_deps, ++ install: true) ++ ++pkg.generate(call_ui_lib) ++ ++install_headers( ++ 'call-ui.h', ++ 'cui-call.h', ++ 'cui-call-display.h', ++ 'cui-main.h', ++ 'cui-dialpad.h', ++ 'cui-keypad.h', ++) + + libcall_ui_dep = declare_dependency( + sources: call_ui_enum_sources, + +base-commit: 817d770cfa6876d37c4a6d09b00c9bdedfdce8b7 +-- +2.41.0 + From patchwork Tue Oct 31 19:35:04 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Vivien Kraus X-Patchwork-Id: 55744 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 1D60327BBE9; Tue, 31 Oct 2023 19:41:46 +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=-1.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,PP_MIME_FAKE_ASCII_TEXT,SPF_HELO_PASS, URIBL_BLOCKED autolearn=no 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 C22C827BBE2 for ; Tue, 31 Oct 2023 19:41:44 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qxucE-0004TB-1r; Tue, 31 Oct 2023 15:41:30 -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 1qxucC-0004SM-9e for guix-patches@gnu.org; Tue, 31 Oct 2023 15:41:28 -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 1qxucC-0005kI-1j for guix-patches@gnu.org; Tue, 31 Oct 2023 15:41:28 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qxucj-0005xV-U7 for guix-patches@gnu.org; Tue, 31 Oct 2023 15:42:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66823] [PATCH gnome-team v3 6/6] gnu: Add calls. Resent-From: Vivien Kraus Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 31 Oct 2023 19:42:01 +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: Maxim Cournoyer Cc: rg@raghavgururajan.name, Liliana Marie Prikler , 66823@debbugs.gnu.org Received: via spool by 66823-submit@debbugs.gnu.org id=B66823.169878126522805 (code B ref 66823); Tue, 31 Oct 2023 19:42:01 +0000 Received: (at 66823) by debbugs.gnu.org; 31 Oct 2023 19:41:05 +0000 Received: from localhost ([127.0.0.1]:49216 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubn-0005vS-Vw for submit@debbugs.gnu.org; Tue, 31 Oct 2023 15:41:05 -0400 Received: from planete-kraus.eu ([89.234.140.182]:41906) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qxubh-0005sx-C7 for 66823@debbugs.gnu.org; Tue, 31 Oct 2023 15:41:02 -0400 Received: from planete-kraus.eu (localhost.lan [127.0.0.1]) by planete-kraus.eu (OpenSMTPD) with ESMTP id 539882ff; Tue, 31 Oct 2023 19:40:22 +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=7ZGj7RzoqWCOa4WQDEYtQqMeCcg=; b=y A7fLW+jTGi/1G3AEwNNhGo2XXsaql05+4cq/ooADjh1+v3xUXDkZbkYB0V5pik37 xhiIR/1cGUiqCoBXZV3eHwfe/yjKEQRQgdp/tKabriz2Z/PUweyRuCuVlRlJ1av8 ekKIJ4sb8CLOLEI8bjatvY9bz/VS4wyadPkX7RgGQMSScLhnGNZBREkOmghO10ec dGWOWylPHhRp4qhZYOPLRjAvM5nYhYC8GXABZSMWJedHj7+DCYfndg0CkDEG9pCi zLIYJVKRMIHMn3QwiEE5mvaUQ4U66lZEf0h6z5HNYUoiQatP52fiEOG+gWM7iibg 2+jFNoHBj0NBLEg43vvNg== Received: by planete-kraus.eu (OpenSMTPD) with ESMTPSA id c107ddd1 (TLSv1.3:TLS_CHACHA20_POLY1305_SHA256:256:NO); Tue, 31 Oct 2023 19:40:21 +0000 (UTC) Message-ID: In-Reply-To: References: Date: Tue, 31 Oct 2023 20:35:04 +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/calls-disable-application-test.patch: New file. * gnu/packages/patches/calls-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 | 69 +++++++++++++++++- .../calls-disable-application-test.patch | 71 +++++++++++++++++++ .../patches/calls-disable-sip-test.patch | 44 ++++++++++++ 4 files changed, 185 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/calls-disable-application-test.patch create mode 100644 gnu/packages/patches/calls-disable-sip-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 050cb71ef9..27ff79f0f6 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/calls-disable-application-test.patch \ + %D%/packages/patches/calls-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..c37e806394 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -212,6 +212,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages swig) + #:use-module (gnu packages telephony) #:use-module (gnu packages tex) #:use-module (gnu packages time) #:use-module (gnu packages tls) @@ -13509,7 +13510,7 @@ (define-public libcall-ui (propagated-inputs ; All these in call-ui.pc. (list glib gtk+ - (@ (gnu packages telephony) libcallaudio) + libcallaudio libhandy)) (native-inputs (list `(,glib "bin") ; glib-mkenums @@ -13519,3 +13520,69 @@ (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 "calls-disable-application-test.patch" + "calls-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"))) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases + 'check))))) + (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 + 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 @acronym{SIP, Session Initiation +Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/calls-disable-application-test.patch b/gnu/packages/patches/calls-disable-application-test.patch new file mode 100644 index 0000000000..ddd6d2a328 --- /dev/null +++ b/gnu/packages/patches/calls-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/calls-disable-sip-test.patch b/gnu/packages/patches/calls-disable-sip-test.patch new file mode 100644 index 0000000000..75e9294fc0 --- /dev/null +++ b/gnu/packages/patches/calls-disable-sip-test.patch @@ -0,0 +1,44 @@ +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. +--- + +This test passes in a guix shell --container --network but not in +guix shell --container. The most likely cause is it requires access to the +network. + + 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 +