* [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls @ 2023-10-29 16:44 Vivien Kraus via Guix-patches via 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls Vivien Kraus via Guix-patches via ` (7 more replies) 0 siblings, 8 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 16:44 UTC (permalink / raw) To: 66823; +Cc: rg, liliana.prikler, maxim.cournoyer Dear guix, For GNOME 44, the release engineering team mentioned that Calls is now a core application. Here it is! What do you think? Best regards, Vivien Vivien Kraus (4): gnu: feedbackd: Update to 0.2.1. gnu: Add sofia-sip. gnu: Add libcallaudio. gnu: Add calls. gnu/packages/gnome.scm | 103 ++++++++++++++++++++++++++++++++++++- gnu/packages/telephony.scm | 99 +++++++++++++++++++++++++++++++++++ 2 files changed, 200 insertions(+), 2 deletions(-) base-commit: 2677bf985c0025d04ffdcff31763978b633dbc58 -- 2.41.0 ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls. 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via @ 2023-10-29 11:04 ` Vivien Kraus via Guix-patches via 2023-10-29 17:09 ` Liliana Marie Prikler 2023-10-31 14:21 ` Maxim Cournoyer 2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team 1/4] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via ` (6 subsequent siblings) 7 siblings, 2 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 11:04 UTC (permalink / raw) To: 66823; +Cc: rg, liliana.prikler, maxim.cournoyer * gnu/packages/gnome.scm (libcallaudio): New variable. Change-Id: I6f0485e4c73536c576713005cf7cd74610923a21 --- gnu/packages/gnome.scm | 82 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 82 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8092715795..2536b8f98d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13463,3 +13463,85 @@ (define-public xffm+ (home-page "http://xffm.org/") (license license:gpl3+) (properties '((upstream-name . "xffm"))))) + +(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")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:configure-flags #~'("-Dgtk_doc=true") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-gmobile + (lambda _ + (copy-recursively + #$(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"))) + "subprojects/libcall-ui"))) + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; 3 tests fail with: Could not create pipeline: Could not create + ;; 'srtpdec' element of type srtpdec + (substitute* "plugins/provider/tests/meson.build" + (("^test\\('media'") + "# test('media'") + (("^test\\('sip'") + "# test('sip'")) + (call-with-output-file "tests/test-application.c" + (lambda (port) + (format port "int main(void) { return 0; }"))))) + (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 + gtk+ + libgee + libpeas + (@ (gnu packages telephony) libcallaudio) + 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))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls. 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls Vivien Kraus via Guix-patches via @ 2023-10-29 17:09 ` Liliana Marie Prikler 2023-10-31 14:21 ` Maxim Cournoyer 1 sibling, 0 replies; 56+ messages in thread From: Liliana Marie Prikler @ 2023-10-29 17:09 UTC (permalink / raw) To: Vivien Kraus, 66823; +Cc: rg, maxim.cournoyer Am Sonntag, dem 29.10.2023 um 12:04 +0100 schrieb Vivien Kraus: > * gnu/packages/gnome.scm (libcallaudio): New variable. > > Change-Id: I6f0485e4c73536c576713005cf7cd74610923a21 > --- > gnu/packages/gnome.scm | 82 > ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 82 insertions(+) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 8092715795..2536b8f98d 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -13463,3 +13463,85 @@ (define-public xffm+ > (home-page "http://xffm.org/") > (license license:gpl3+) > (properties '((upstream-name . "xffm"))))) > + > +(define-public calls > + (package > + (name "calls") > + (version "45.0") Version 45 is nice and all, but perhaps we should stick to 44 if we can build that with less hassle. > + (source (origin > + (method url-fetch) > + (uri (string-append "mirror://gnome/sources/" name "/" > + (version-major version) "/" > + name "-" version ".tar.xz")) > + (sha256 > + (base32 > + > "1mvnrm5wbl69xbcjg8nxd6l6nj2fd3whbyh70axlm75c7l7d5j5r")))) > + (build-system meson-build-system) > + (arguments > + (list > + #:glib-or-gtk? #t > + #:configure-flags #~'("-Dgtk_doc=true") > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'unpack-gmobile > + (lambda _ > + (copy-recursively > + #$(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"))) > + "subprojects/libcall-ui"))) > + (add-after 'unpack 'disable-failing-test > + (lambda _ > + ;; 3 tests fail with: Could not create pipeline: Could > not create > + ;; 'srtpdec' element of type srtpdec > + (substitute* "plugins/provider/tests/meson.build" > + (("^test\\('media'") > + "# test('media'") > + (("^test\\('sip'") > + "# test('sip'")) This looks like a broken GStreamer dependency. I'd hazard a guess that the application itself will fail as well. srtpdec is part of the bad gstreamer plugins, you can probably use gst-plugins/selection to not pull in all of the plugins. > + (call-with-output-file "tests/test-application.c" > + (lambda (port) > + (format port "int main(void) { return 0; }"))))) Uhm… yeah… > + (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 > + gtk+ > + libgee > + libpeas > + (@ (gnu packages telephony) libcallaudio) > + 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))) No +? Cheers ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls. 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls Vivien Kraus via Guix-patches via 2023-10-29 17:09 ` Liliana Marie Prikler @ 2023-10-31 14:21 ` Maxim Cournoyer 1 sibling, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-10-31 14:21 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, liliana.prikler, 66823 Hi Vivien, Vivien Kraus <vivien@planete-kraus.eu> writes: > * gnu/packages/gnome.scm (libcallaudio): New variable. > > Change-Id: I6f0485e4c73536c576713005cf7cd74610923a21 > --- > gnu/packages/gnome.scm | 82 ++++++++++++++++++++++++++++++++++++++++++ > 1 file changed, 82 insertions(+) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index 8092715795..2536b8f98d 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -13463,3 +13463,85 @@ (define-public xffm+ > (home-page "http://xffm.org/") > (license license:gpl3+) > (properties '((upstream-name . "xffm"))))) > + > +(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")))) > + (build-system meson-build-system) > + (arguments > + (list > + #:glib-or-gtk? #t > + #:configure-flags #~'("-Dgtk_doc=true") > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'unpack-gmobile > + (lambda _ > + (copy-recursively > + #$(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"))) > + "subprojects/libcall-ui"))) > + (add-after 'unpack 'disable-failing-test > + (lambda _ > + ;; 3 tests fail with: Could not create pipeline: Could not create > + ;; 'srtpdec' element of type srtpdec Nitpick: I'd double-quote the error and add a trailing '.'. It'd be nice to understand where this error comes from; e.g. is it because we're not building gstreamer with an optional dependency? > + (substitute* "plugins/provider/tests/meson.build" > + (("^test\\('media'") > + "# test('media'") > + (("^test\\('sip'") > + "# test('sip'")) > + (call-with-output-file "tests/test-application.c" > + (lambda (port) > + (format port "int main(void) { return 0; }"))))) > + (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 > + gtk+ > + libgee > + libpeas Same comment as earlier about the @ import hack, but I guess there was a cyclic problem, as something in (gnu packages telephony) is not following the rules laid in (info 'guix (Cyclic Module Dependencies)'). The problem likely stems from the ffmpeg-jami variant that inherits ffmpeg from a different module (these are top level references and *not* delayed). > + (@ (gnu packages telephony) libcallaudio) > + 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 Nitpick: Ensure at least 2 leading spaces before a ';' inline comment. I like to use M-; in Emacs to produce those, as it also aligns them. I also don't put a space between the ';' and the *inline* comment. Otherwise, LGTM. I'll be looking forward to try it! -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 1/4] gnu: feedbackd: Update to 0.2.1. 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls Vivien Kraus via Guix-patches via @ 2023-10-29 16:32 ` Vivien Kraus via Guix-patches via 2023-10-29 17:10 ` Liliana Marie Prikler 2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip Vivien Kraus via Guix-patches via ` (5 subsequent siblings) 7 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 16:32 UTC (permalink / raw) To: 66823; +Cc: rg, liliana.prikler, maxim.cournoyer The package now uses a “gmobile” submodule that should be included as-is. * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. [#:phases 'unpack-gmobile]: New phase. Change-Id: I06521c1673efb6aea1d163410fdf3d0206b57d8a --- gnu/packages/gnome.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a86ddc34b3..8092715795 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12918,7 +12918,7 @@ (define-public jsonrpc-glib (define-public feedbackd (package (name "feedbackd") - (version "0.0.0+git20200527") + (version "0.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -12927,8 +12927,25 @@ (define-public feedbackd (file-name (git-file-name name version)) (sha256 (base32 - "1wbkzxnqjydfgjvp7vz4ghczcz740zcb1yn90cb6gb5md4n6qx2y")))) + "1acwpb8cgzyvzriphrb42k3d7njwcn88j66i5wz75yx2sbfaf93q")))) (build-system meson-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'unpack-gmobile + (lambda _ + (copy-recursively + #$(origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/guidog/gmobile") + (commit "d483537aee4778b114ce5d50c4c8a9f8d58337ed"))) + (file-name (git-file-name "gmobile" version)) + (sha256 + (base32 + "1789sdj4rkj1hh2r3jp45jn2df4vf2mqgk1jbc3ccrv39z0b9f4w"))) + "subprojects/gmobile")))))) (native-inputs (list `(,glib "bin") gobject-introspection pkg-config vala)) (inputs -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 1/4] gnu: feedbackd: Update to 0.2.1. 2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team 1/4] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-10-29 17:10 ` Liliana Marie Prikler 2023-10-31 13:54 ` Maxim Cournoyer 0 siblings, 1 reply; 56+ messages in thread From: Liliana Marie Prikler @ 2023-10-29 17:10 UTC (permalink / raw) To: Vivien Kraus, 66823; +Cc: rg, maxim.cournoyer Am Sonntag, dem 29.10.2023 um 17:32 +0100 schrieb Vivien Kraus: > The package now uses a “gmobile” submodule that should be included > as-is. > > * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. > [#:phases 'unpack-gmobile]: New phase. Should be: [#:phases]: Add ‘unpack-gmobile’. You might want to look into building this with an already installed gmobile; meson ought to support that use case. > Change-Id: I06521c1673efb6aea1d163410fdf3d0206b57d8a > --- > gnu/packages/gnome.scm | 21 +++++++++++++++++++-- > 1 file changed, 19 insertions(+), 2 deletions(-) > > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm > index a86ddc34b3..8092715795 100644 > --- a/gnu/packages/gnome.scm > +++ b/gnu/packages/gnome.scm > @@ -12918,7 +12918,7 @@ (define-public jsonrpc-glib > (define-public feedbackd > (package > (name "feedbackd") > - (version "0.0.0+git20200527") > + (version "0.2.1") > (source (origin > (method git-fetch) > (uri (git-reference > @@ -12927,8 +12927,25 @@ (define-public feedbackd > (file-name (git-file-name name version)) > (sha256 > (base32 > - > "1wbkzxnqjydfgjvp7vz4ghczcz740zcb1yn90cb6gb5md4n6qx2y")))) > + > "1acwpb8cgzyvzriphrb42k3d7njwcn88j66i5wz75yx2sbfaf93q")))) > (build-system meson-build-system) > + (arguments > + (list > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'unpack-gmobile > + (lambda _ > + (copy-recursively > + #$(origin > + (method git-fetch) > + (uri (git-reference > + (url > "https://gitlab.gnome.org/guidog/gmobile") > + (commit > "d483537aee4778b114ce5d50c4c8a9f8d58337ed"))) > + (file-name (git-file-name "gmobile" version)) > + (sha256 > + (base32 > + > "1789sdj4rkj1hh2r3jp45jn2df4vf2mqgk1jbc3ccrv39z0b9f4w"))) > + "subprojects/gmobile")))))) > (native-inputs > (list `(,glib "bin") gobject-introspection pkg-config vala)) > (inputs Cheers ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 1/4] gnu: feedbackd: Update to 0.2.1. 2023-10-29 17:10 ` Liliana Marie Prikler @ 2023-10-31 13:54 ` Maxim Cournoyer 0 siblings, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-10-31 13:54 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, Vivien Kraus, 66823 Hello, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Sonntag, dem 29.10.2023 um 17:32 +0100 schrieb Vivien Kraus: >> The package now uses a “gmobile” submodule that should be included >> as-is. >> >> * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. >> [#:phases 'unpack-gmobile]: New phase. > Should be: [#:phases]: Add ‘unpack-gmobile’. You might want to look > into building this with an already installed gmobile; meson ought to > support that use case. +1, or at least... >> Change-Id: I06521c1673efb6aea1d163410fdf3d0206b57d8a >> --- >> gnu/packages/gnome.scm | 21 +++++++++++++++++++-- >> 1 file changed, 19 insertions(+), 2 deletions(-) >> >> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm >> index a86ddc34b3..8092715795 100644 >> --- a/gnu/packages/gnome.scm >> +++ b/gnu/packages/gnome.scm >> @@ -12918,7 +12918,7 @@ (define-public jsonrpc-glib >> (define-public feedbackd >> (package >> (name "feedbackd") >> - (version "0.0.0+git20200527") >> + (version "0.2.1") >> (source (origin >> (method git-fetch) >> (uri (git-reference >> @@ -12927,8 +12927,25 @@ (define-public feedbackd >> (file-name (git-file-name name version)) >> (sha256 >> (base32 >> - >> "1wbkzxnqjydfgjvp7vz4ghczcz740zcb1yn90cb6gb5md4n6qx2y")))) >> + >> "1acwpb8cgzyvzriphrb42k3d7njwcn88j66i5wz75yx2sbfaf93q")))) >> (build-system meson-build-system) >> + (arguments >> + (list >> + #:phases >> + #~(modify-phases %standard-phases >> + (add-after 'unpack 'unpack-gmobile ... a comment here explaining why we can't simply use gmobile as a library (build system limitation? link to upstream issue?) is needed. Otherwise it LGTM. -- Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip. 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls Vivien Kraus via Guix-patches via 2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team 1/4] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-10-29 16:34 ` Vivien Kraus via Guix-patches via 2023-10-29 17:13 ` Liliana Marie Prikler 2023-10-31 14:00 ` Maxim Cournoyer 2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team 3/4] gnu: Add libcallaudio Vivien Kraus via Guix-patches via ` (4 subsequent siblings) 7 siblings, 2 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 16:34 UTC (permalink / raw) To: 66823; +Cc: rg, liliana.prikler, maxim.cournoyer [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 3745 bytes --] * gnu/packages/telephony.scm (sofia-sip): New variable. Change-Id: I18dd31fa62f5cfe528d7558915135f17d49b798d --- gnu/packages/telephony.scm | 72 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 42158784ca..d99b10903e 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -1088,3 +1088,75 @@ (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), looks like a mistake. + "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 _ + ;; 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 + (@ (gnu packages compression) 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 SIP User-Agent library, compliant with the IETF RFC3261 +specification. It can be used as a building block for SIP client software for +uses such as VoIP, IM, and many other real-time and person-to-person +communication services.") + (license license:lgpl2.1))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip. 2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip Vivien Kraus via Guix-patches via @ 2023-10-29 17:13 ` Liliana Marie Prikler 2023-10-31 14:00 ` Maxim Cournoyer 1 sibling, 0 replies; 56+ messages in thread From: Liliana Marie Prikler @ 2023-10-29 17:13 UTC (permalink / raw) To: Vivien Kraus, 66823; +Cc: rg, maxim.cournoyer Am Sonntag, dem 29.10.2023 um 17:34 +0100 schrieb Vivien Kraus: > * gnu/packages/telephony.scm (sofia-sip): New variable. > > Change-Id: I18dd31fa62f5cfe528d7558915135f17d49b798d > --- > gnu/packages/telephony.scm | 72 > ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm > index 42158784ca..d99b10903e 100644 > --- a/gnu/packages/telephony.scm > +++ b/gnu/packages/telephony.scm > @@ -1088,3 +1088,75 @@ (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), looks like a > mistake. > + "TESTS_ENVIRONMENT = \ > +export CHECK_NTA_VERBOSE=10; \ > +export CHECK_NUA_VERBOSE=10; ") Ehm, your code looks like a mistake. $(SHELL) probably expands to '/bin/sh' or '/usr/bin/env FOO=BAR … --'. You might want to use the latter to set all those variables. > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'patch-shebangs > + (lambda _ > + (patch-shebang "autogen.sh"))) > + (add-after 'unpack 'disable-failing-test > + (lambda _ > + ;; 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 > + (@ (gnu packages compression) 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 SIP User-Agent library, compliant > with the IETF RFC3261 > +specification. It can be used as a building block for SIP client > software for > +uses such as VoIP, IM, and many other real-time and person-to-person > +communication services.") > + (license license:lgpl2.1))) Cheers ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip. 2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip Vivien Kraus via Guix-patches via 2023-10-29 17:13 ` Liliana Marie Prikler @ 2023-10-31 14:00 ` Maxim Cournoyer 1 sibling, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-10-31 14:00 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, liliana.prikler, 66823 Hi Vivien, Vivien Kraus <vivien@planete-kraus.eu> writes: > * gnu/packages/telephony.scm (sofia-sip): New variable. > > Change-Id: I18dd31fa62f5cfe528d7558915135f17d49b798d > --- > gnu/packages/telephony.scm | 72 ++++++++++++++++++++++++++++++++++++++ > 1 file changed, 72 insertions(+) > > diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm > index 42158784ca..d99b10903e 100644 > --- a/gnu/packages/telephony.scm > +++ b/gnu/packages/telephony.scm > @@ -1088,3 +1088,75 @@ (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 The 'TESTS_ENVIRONMENT = $(SHELL)' issue sounds worth reporting upstream, then linking here. > + ;; TESTS_ENVIRONMENT = $(SHELL), looks like a mistake. > + "TESTS_ENVIRONMENT = \ > +export CHECK_NTA_VERBOSE=10; \ > +export CHECK_NUA_VERBOSE=10; ") > + #:phases > + #~(modify-phases %standard-phases > + (add-after 'unpack 'patch-shebangs Is this really patching shebangs, or paths in the body of the script? Shebangs should be patched automatically by the patch-source-shebangs phase (or similarly named). > + (lambda _ > + (patch-shebang "autogen.sh"))) > + (add-after 'unpack 'disable-failing-test > + (lambda _ > + ;; 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. Personally, I'd report such experience to upstream; as that's far from optimal :-). Maybe they'll consider disabling flaky/long tests by default or offer a flag to do so. > + (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 Why the @ hack here? Was there a module top-level cyclic dependency problem otherwise? A comment is needed (or the hack removed). > + (@ (gnu packages compression) 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 SIP User-Agent library, compliant with the IETF RFC3261 > +specification. It can be used as a building block for SIP client software for > +uses such as VoIP, IM, and many other real-time and person-to-person > +communication services.") Sounds good to me; you may want to use @acronym for SIP/VoIP/IM for the first occurrences in the description, and perhaps a @url for the IETF RFC3261 text. -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 3/4] gnu: Add libcallaudio. 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via ` (2 preceding siblings ...) 2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip Vivien Kraus via Guix-patches via @ 2023-10-29 16:36 ` Vivien Kraus via Guix-patches via 2023-10-31 14:02 ` Maxim Cournoyer 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via ` (3 subsequent siblings) 7 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 16:36 UTC (permalink / raw) To: 66823; +Cc: rg, liliana.prikler, maxim.cournoyer * gnu/packages/telephony.scm (libcallaudio): New variable. Change-Id: I41cfe14136858fe0b2a302a9ed8d624d44ad2a95 --- gnu/packages/telephony.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index d99b10903e..ca004afc7f 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -94,6 +94,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 @@ -1160,3 +1161,29 @@ (define-public sofia-sip uses such as VoIP, IM, 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 callaudiod, a daemon to route audio during phone calls, +and a library.") + (license license:gpl3+))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team 3/4] gnu: Add libcallaudio. 2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team 3/4] gnu: Add libcallaudio Vivien Kraus via Guix-patches via @ 2023-10-31 14:02 ` Maxim Cournoyer 0 siblings, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-10-31 14:02 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, liliana.prikler, 66823 Hi, Vivien Kraus <vivien@planete-kraus.eu> writes: > * gnu/packages/telephony.scm (libcallaudio): New variable. > > Change-Id: I41cfe14136858fe0b2a302a9ed8d624d44ad2a95 > --- > gnu/packages/telephony.scm | 27 +++++++++++++++++++++++++++ > 1 file changed, 27 insertions(+) > > diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm > index d99b10903e..ca004afc7f 100644 > --- a/gnu/packages/telephony.scm > +++ b/gnu/packages/telephony.scm > @@ -94,6 +94,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 > @@ -1160,3 +1161,29 @@ (define-public sofia-sip > uses such as VoIP, IM, 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)) Nitpick: for less than 5 inputs, if they fit on the line, I prefer (and 'guix style' too, I think): --8<---------------cut here---------------start------------->8--- (inputs (list one two ...)) --8<---------------cut here---------------end--------------->8--- on a single line. > + (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 callaudiod, a daemon to route audio during phone calls, > +and a library.") I'd use @command{callaudiod}. Otherwise LGTM. -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via ` (3 preceding siblings ...) 2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team 3/4] gnu: Add libcallaudio Vivien Kraus via Guix-patches via @ 2023-10-29 20:15 ` Vivien Kraus via Guix-patches via 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls Vivien Kraus via Guix-patches via ` (5 more replies) 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via ` (2 subsequent siblings) 7 siblings, 6 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 20:15 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, maxim.cournoyer, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 1706 bytes --] I unpacked the libraries, but I’m still stuck with 2 tests in calls. The “sip” test is an end-to-end test of a SIP call. It works if I am in a shell with the environment-variables sourced, but it does not in the build container. Maybe it is because access to the network is more difficult in the container: the test might not expect to have no other IP than 127.0.0.1. I’m also worried about the application test. I tried all the add-before and replace check phases that I could find, and it does not help. Best regards, Vivien Vivien Kraus (6): gnu: Add gmobile. gnu: feedbackd: Update to 0.2.1. gnu: Add sofia-sip. gnu: Add libcallaudio. gnu: Add libcall-ui. gnu: Add calls. gnu/local.mk | 5 + gnu/packages/gnome.scm | 140 +++++++++++++++++- .../call-disable-application-test.patch | 71 +++++++++ .../patches/call-disable-sip-test.patch | 39 +++++ .../feedbackd-use-system-gmobile.patch | 39 +++++ .../patches/gmobile-make-it-installable.patch | 87 +++++++++++ .../libcall-ui-make-it-installable.patch | 79 ++++++++++ gnu/packages/telephony.scm | 102 +++++++++++++ 8 files changed, 559 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/call-disable-application-test.patch create mode 100644 gnu/packages/patches/call-disable-sip-test.patch create mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch create mode 100644 gnu/packages/patches/gmobile-make-it-installable.patch create mode 100644 gnu/packages/patches/libcall-ui-make-it-installable.patch base-commit: 2677bf985c0025d04ffdcff31763978b633dbc58 -- 2.41.0 ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls. 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via @ 2023-10-29 11:04 ` Vivien Kraus via Guix-patches via 2023-10-31 14:43 ` Maxim Cournoyer 2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team v2 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via ` (4 subsequent siblings) 5 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 11:04 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, maxim.cournoyer, 66823 * 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 <vivien@planete-kraus.eu> +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 <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls. 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls Vivien Kraus via Guix-patches via @ 2023-10-31 14:43 ` Maxim Cournoyer 0 siblings, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-10-31 14:43 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 66823 Hi Vivien, Vivien Kraus <vivien@planete-kraus.eu> writes: > * 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. You mentioned the sip test *did* work in a 'guix shell'. When troubleshooting such problems, I usually go this route: 1. Does it work in a 'guix shell --pure' ? 2. Does it work in a 'guix shell --container --network' ? 3. Does it work in a 'guix shell --container' ? 4. Does it work in a 'guix shell --container', after doing 'rm /bin/sh' in the container? -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 2/6] gnu: feedbackd: Update to 0.2.1. 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls Vivien Kraus via Guix-patches via @ 2023-10-29 16:32 ` Vivien Kraus via Guix-patches via 2023-10-31 14:38 ` Maxim Cournoyer 2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team v2 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via ` (3 subsequent siblings) 5 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 16:32 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, maxim.cournoyer, 66823 * 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 | 39 +++++++++++++++++++ 3 files changed, 49 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..4dc3534a07 --- /dev/null +++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch @@ -0,0 +1,39 @@ +From 9a967f056379b0f024ceeff45fcb8889a3fe093e Mon Sep 17 00:00:00 2001 +Message-ID: <9a967f056379b0f024ceeff45fcb8889a3fe093e.1698603600.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +Date: Sun, 29 Oct 2023 19:12:27 +0100 +Subject: [PATCH] Use a system-installed gmodule. + +* meson.build (gmobile_subp): Remove. +(gmobile): Make it a pkg-config dependency. +--- + meson.build | 8 +------- + subprojects/gmobile/.empty | 0 + 2 files changed, 1 insertion(+), 7 deletions(-) + delete mode 100644 subprojects/gmobile/.empty + +diff --git a/meson.build b/meson.build +index 8725e76..347ded1 100644 +--- a/meson.build ++++ b/meson.build +@@ -14,13 +14,7 @@ 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', +- default_options: [ +- 'examples=false', +- 'gtk_doc=false', +- 'tests=false', +- ]) +- gmobile = gmobile_subp.get_variable('gmobile_dep') ++ gmobile = dependency('gmobile') + gsound = dependency('gsound') + gudev = dependency('gudev-1.0', version: '>=232') + json_glib = dependency('json-glib-1.0') +index e69de29..0000000 + +base-commit: 853bd6d7ea8455efea063ba7c4f29ce8c203285f +-- +2.41.0 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 2/6] gnu: feedbackd: Update to 0.2.1. 2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team v2 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-10-31 14:38 ` Maxim Cournoyer 0 siblings, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-10-31 14:38 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 66823 Hi, Vivien Kraus <vivien@planete-kraus.eu> writes: > * 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. [...] > 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..4dc3534a07 > --- /dev/null > +++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch > @@ -0,0 +1,39 @@ > +From 9a967f056379b0f024ceeff45fcb8889a3fe093e Mon Sep 17 00:00:00 2001 > +Message-ID: <9a967f056379b0f024ceeff45fcb8889a3fe093e.1698603600.git.vivien@planete-kraus.eu> > +From: Vivien Kraus <vivien@planete-kraus.eu> > +Date: Sun, 29 Oct 2023 19:12:27 +0100 > +Subject: [PATCH] Use a system-installed gmodule. > + > +* meson.build (gmobile_subp): Remove. > +(gmobile): Make it a pkg-config dependency. > +--- > + meson.build | 8 +------- > + subprojects/gmobile/.empty | 0 > + 2 files changed, 1 insertion(+), 7 deletions(-) > + delete mode 100644 subprojects/gmobile/.empty > + > +diff --git a/meson.build b/meson.build > +index 8725e76..347ded1 100644 > +--- a/meson.build > ++++ b/meson.build > +@@ -14,13 +14,7 @@ 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', > +- default_options: [ > +- 'examples=false', > +- 'gtk_doc=false', > +- 'tests=false', > +- ]) > +- gmobile = gmobile_subp.get_variable('gmobile_dep') > ++ gmobile = dependency('gmobile') There is a better way to accomplish the above, documented at [0]. Implemented as such, I think upstream would probably be interested in merging it as-is, which we should do (forward the patch). The alternative is maintaining custom patches ad vitam aeternam, which is a lot of work :-). [0] https://mesonbuild.com/Subprojects.html#toggling-between-system-libraries-and-embedded-sources -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 3/6] gnu: Add sofia-sip. 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team v2 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-10-29 16:34 ` Vivien Kraus via Guix-patches via 2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team v2 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via ` (2 subsequent siblings) 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 16:34 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, maxim.cournoyer, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 3931 bytes --] * gnu/packages/telephony.scm (sofia-sip): New variable. Change-Id: I18dd31fa62f5cfe528d7558915135f17d49b798d --- gnu/packages/telephony.scm | 75 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 75 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 42158784ca..1b15f4ee17 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -1088,3 +1088,78 @@ (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 _ + ;; 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 + (@ (gnu packages compression) 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 SIP User-Agent library, compliant with the IETF RFC3261 +specification. It can be used as a building block for SIP client software for +uses such as VoIP, IM, and many other real-time and person-to-person +communication services.") + (license license:lgpl2.1))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 4/6] gnu: Add libcallaudio. 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via ` (2 preceding siblings ...) 2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team v2 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via @ 2023-10-29 16:36 ` Vivien Kraus via Guix-patches via 2023-10-29 18:34 ` [bug#66823] [PATCH gnome-team v2 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via 2023-10-29 19:05 ` [bug#66823] [PATCH gnome-team v2 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 16:36 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, maxim.cournoyer, 66823 * gnu/packages/telephony.scm (libcallaudio): New variable. Change-Id: I41cfe14136858fe0b2a302a9ed8d624d44ad2a95 --- gnu/packages/telephony.scm | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 1b15f4ee17..3fe61a3edf 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -94,6 +94,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 @@ -1163,3 +1164,29 @@ (define-public sofia-sip uses such as VoIP, IM, 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 callaudiod, a daemon to route audio during phone calls, +and a library.") + (license license:gpl3+))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 1/6] gnu: Add gmobile. 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via ` (3 preceding siblings ...) 2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team v2 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via @ 2023-10-29 18:34 ` Vivien Kraus via Guix-patches via 2023-10-31 14:30 ` Maxim Cournoyer 2023-10-29 19:05 ` [bug#66823] [PATCH gnome-team v2 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via 5 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 18:34 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, maxim.cournoyer, 66823 * 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 | 87 +++++++++++++++++++ 3 files changed, 115 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..03e106c2b0 --- /dev/null +++ b/gnu/packages/patches/gmobile-make-it-installable.patch @@ -0,0 +1,87 @@ +From c1ea43a45f4588f21752b0ad679c43350a9c8905 Mon Sep 17 00:00:00 2001 +Message-ID: <c1ea43a45f4588f21752b0ad679c43350a9c8905.1698604357.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +Date: Sun, 29 Oct 2023 19:00:44 +0100 +Subject: [PATCH] Install gmobile as a shared library. + +* 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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 1/6] gnu: Add gmobile. 2023-10-29 18:34 ` [bug#66823] [PATCH gnome-team v2 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via @ 2023-10-31 14:30 ` Maxim Cournoyer 0 siblings, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-10-31 14:30 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 66823 Hi! Vivien Kraus <vivien@planete-kraus.eu> writes: > * gnu/packages/gnome.scm (gmobile): New variable. > * gnu/packages/patches/gmobile-make-it-installable.patch: New file. Great work! Did you forward it upstream? It'd be nice to have them maintained the change forward! If you have done so, please mention the upstream MR in the patch, so that we can track its status. -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 5/6] gnu: Add libcall-ui. 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via ` (4 preceding siblings ...) 2023-10-29 18:34 ` [bug#66823] [PATCH gnome-team v2 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via @ 2023-10-29 19:05 ` Vivien Kraus via Guix-patches via 2023-10-31 14:40 ` Maxim Cournoyer 5 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-29 19:05 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, maxim.cournoyer, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 5622 bytes --] * 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 | 79 +++++++++++++++++++ 3 files changed, 120 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..a06189df0a --- /dev/null +++ b/gnu/packages/patches/libcall-ui-make-it-installable.patch @@ -0,0 +1,79 @@ +From 1a79c18e85232a6f56a58ec99271b92d5b0e6dca Mon Sep 17 00:00:00 2001 +Message-ID: <1a79c18e85232a6f56a58ec99271b92d5b0e6dca.1698606228.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +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 + +* 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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v2 5/6] gnu: Add libcall-ui. 2023-10-29 19:05 ` [bug#66823] [PATCH gnome-team v2 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via @ 2023-10-31 14:40 ` Maxim Cournoyer 0 siblings, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-10-31 14:40 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 66823 Hi, Vivien Kraus <vivien@planete-kraus.eu> writes: > * gnu/packages/gnome.scm (libcall-ui): New variable. > * gnu/packages/patches/libcall-ui-make-it-installable.patch: New file. [...] > 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..a06189df0a > --- /dev/null > +++ b/gnu/packages/patches/libcall-ui-make-it-installable.patch > @@ -0,0 +1,79 @@ What is the upstream status? (add a link to the merge request). -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via ` (4 preceding siblings ...) 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via @ 2023-10-31 19:36 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via ` (5 more replies) 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via 7 siblings, 6 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:36 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 Dear guix, Here is a new version. I tried to inform upstream (see individual patches), however I am still waiting for Purism to open my account (for feedbackd). Best regards, Vivien Vivien Kraus (6): gnu: Add gmobile. gnu: feedbackd: Update to 0.2.1. gnu: Add sofia-sip. gnu: Add libcallaudio. gnu: Add libcall-ui. gnu: Add calls. gnu/local.mk | 5 + gnu/packages/gnome.scm | 146 +++++++++++++++++- .../calls-disable-application-test.patch | 71 +++++++++ .../patches/calls-disable-sip-test.patch | 44 ++++++ .../feedbackd-use-system-gmobile.patch | 40 +++++ .../patches/gmobile-make-it-installable.patch | 89 +++++++++++ .../libcall-ui-make-it-installable.patch | 81 ++++++++++ gnu/packages/telephony.scm | 106 +++++++++++++ 8 files changed, 579 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/calls-disable-application-test.patch create mode 100644 gnu/packages/patches/calls-disable-sip-test.patch create mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch create mode 100644 gnu/packages/patches/gmobile-make-it-installable.patch create mode 100644 gnu/packages/patches/libcall-ui-make-it-installable.patch base-commit: 2677bf985c0025d04ffdcff31763978b633dbc58 -- 2.41.0 ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v3 1/6] gnu: Add gmobile. 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via ` (4 subsequent siblings) 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 * 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: <c1ea43a45f4588f21752b0ad679c43350a9c8905.1698604357.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v3 2/6] gnu: feedbackd: Update to 0.2.1. 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via ` (3 subsequent siblings) 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 * 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: <af9e72124b12ca481fd3592f9c8ea2649f7e4c80.1698775513.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v3 3/6] gnu: Add sofia-sip. 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via ` (2 subsequent siblings) 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 4538 bytes --] * 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))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v3 4/6] gnu: Add libcallaudio. 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via ` (2 preceding siblings ...) 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v3 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v3 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 * 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+))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v3 5/6] gnu: Add libcall-ui. 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via ` (3 preceding siblings ...) 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 ` Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v3 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 5695 bytes --] * 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 <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v3 6/6] gnu: Add calls. 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via ` (4 preceding siblings ...) 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v3 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 ` Vivien Kraus via Guix-patches via 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 9624 bytes --] * 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 <vivien@planete-kraus.eu> +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 <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 0/6] Add Calls 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via ` (5 preceding siblings ...) 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via @ 2023-10-31 20:48 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via ` (5 more replies) 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via 7 siblings, 6 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 20:48 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 Dear guix, I to debug Calls, I tried moving the check phase after installation, and I forgot to revert it. Sorry. Vivien Kraus (6): gnu: Add gmobile. gnu: feedbackd: Update to 0.2.1. gnu: Add sofia-sip. gnu: Add libcallaudio. gnu: Add libcall-ui. gnu: Add calls. gnu/local.mk | 5 + gnu/packages/gnome.scm | 142 +++++++++++++++++- .../calls-disable-application-test.patch | 71 +++++++++ .../patches/calls-disable-sip-test.patch | 44 ++++++ .../feedbackd-use-system-gmobile.patch | 40 +++++ .../patches/gmobile-make-it-installable.patch | 89 +++++++++++ .../libcall-ui-make-it-installable.patch | 81 ++++++++++ gnu/packages/telephony.scm | 106 +++++++++++++ 8 files changed, 575 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/calls-disable-application-test.patch create mode 100644 gnu/packages/patches/calls-disable-sip-test.patch create mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch create mode 100644 gnu/packages/patches/gmobile-make-it-installable.patch create mode 100644 gnu/packages/patches/libcall-ui-make-it-installable.patch base-commit: 2677bf985c0025d04ffdcff31763978b633dbc58 -- 2.41.0 ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 1/6] gnu: Add gmobile. 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via ` (4 subsequent siblings) 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 * 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: <c1ea43a45f4588f21752b0ad679c43350a9c8905.1698604357.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1. 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-11-01 3:06 ` Maxim Cournoyer 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via ` (3 subsequent siblings) 5 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 * 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: <af9e72124b12ca481fd3592f9c8ea2649f7e4c80.1698775513.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1. 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-11-01 3:06 ` Maxim Cournoyer 2023-11-01 11:44 ` Liliana Marie Prikler 2023-11-01 15:30 ` Vivien Kraus via Guix-patches via 0 siblings, 2 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-11-01 3:06 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 66823 Hi Vivien, Vivien Kraus <vivien@planete-kraus.eu> writes: > * 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. Missing upstream status for the patch :-). -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1. 2023-11-01 3:06 ` Maxim Cournoyer @ 2023-11-01 11:44 ` Liliana Marie Prikler 2023-11-01 15:30 ` Vivien Kraus via Guix-patches via 1 sibling, 0 replies; 56+ messages in thread From: Liliana Marie Prikler @ 2023-11-01 11:44 UTC (permalink / raw) To: Maxim Cournoyer, Vivien Kraus; +Cc: rg, 66823 Am Dienstag, dem 31.10.2023 um 23:06 -0400 schrieb Maxim Cournoyer: > Hi Vivien, > > Vivien Kraus <vivien@planete-kraus.eu> writes: > > > * 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. > > Missing upstream status for the patch :-). Also typo'd on the ChangeLog. Please keep them up to date :) ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1. 2023-11-01 3:06 ` Maxim Cournoyer 2023-11-01 11:44 ` Liliana Marie Prikler @ 2023-11-01 15:30 ` Vivien Kraus via Guix-patches via 1 sibling, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-11-01 15:30 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 Le mardi 31 octobre 2023 à 23:06 -0400, Maxim Cournoyer a écrit : > Missing upstream status for the patch :-). I am still waiting for Purism to approve my account… ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 3/6] gnu: Add sofia-sip. 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-11-01 3:09 ` Maxim Cournoyer 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via ` (2 subsequent siblings) 5 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 4538 bytes --] * 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))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 3/6] gnu: Add sofia-sip. 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via @ 2023-11-01 3:09 ` Maxim Cournoyer 0 siblings, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-11-01 3:09 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 66823 Hi Vivien: Vivien Kraus <vivien@planete-kraus.eu> writes: > * gnu/packages/telephony.scm (sofia-sip): New variable. [...] > + #~(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. nitpick: I typically use the "Explanatory comment (see: $url)." scheme taught to be by Ludovic as in this case URL is unambiguous (never includes a trailing '.' for example). Thanks for reporting the issues! -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 4/6] gnu: Add libcallaudio. 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via ` (2 preceding siblings ...) 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 * 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+))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 5/6] gnu: Add libcall-ui. 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via ` (3 preceding siblings ...) 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 ` Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 5 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 5695 bytes --] * 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 <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls. 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via ` (4 preceding siblings ...) 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 ` Vivien Kraus via Guix-patches via 2023-11-01 3:15 ` Maxim Cournoyer 5 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 9484 bytes --] * 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 | 65 ++++++++++++++++- .../calls-disable-application-test.patch | 71 +++++++++++++++++++ .../patches/calls-disable-sip-test.patch | 44 ++++++++++++ 4 files changed, 181 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..c9785371c5 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,65 @@ (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")))))) + (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 <vivien@planete-kraus.eu> +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 <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls. 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls Vivien Kraus via Guix-patches via @ 2023-11-01 3:15 ` Maxim Cournoyer 2023-11-01 15:32 ` Vivien Kraus via Guix-patches via 0 siblings, 1 reply; 56+ messages in thread From: Maxim Cournoyer @ 2023-11-01 3:15 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 66823 Hi Vivien, Vivien Kraus <vivien@planete-kraus.eu> writes: > * 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. [...] > +(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")))))) Did you try wrapping the test execution in a dbus_run_session call? Maybe that's what is missing in the build environment? See for example libsecret, which has such a setup. -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls. 2023-11-01 3:15 ` Maxim Cournoyer @ 2023-11-01 15:32 ` Vivien Kraus via Guix-patches via 2023-11-01 19:26 ` Maxim Cournoyer 0 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-11-01 15:32 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Liliana Marie Prikler, 66823 Le mardi 31 octobre 2023 à 23:15 -0400, Maxim Cournoyer a écrit : > Did you try wrapping the test execution in a dbus_run_session call? > Maybe that's what is missing in the build environment? See for > example > libsecret, which has such a setup. The “application” fails: not ok /Calls/application/shutdown_no_daemon - CallsApplication-FATAL- WARNING: Failed to init libcallaudio: Error calling StartServiceByName for org.mobian_project.CallAudio: Process org.mobian_project.CallAudio received signal 5 Bail out! stderr: dbus-daemon[2086]: [session uid=999 pid=2086] Activating service name='org.mobian_project.CallAudio' requested by ':1.0' (uid=999 pid=2094 comm="/tmp/guix-build-calls-45.0.drv-0/build/tests/appli") dbus-daemon[2086]: [session uid=999 pid=2086] Successfully activated service 'org.mobian_project.CallAudio' (process:2130): callaudiod-pulse-CRITICAL **: 07:13:51.933: No suitable card found, stopping here... dbus-daemon[2086]: [session uid=999 pid=2086] Activating service name='org.sigxcpu.Feedback' requested by ':1.0' (uid=999 pid=2094 comm="/tmp/guix-build-calls-45.0.drv-0/build/tests/appli") dbus-daemon[2086]: [session uid=999 pid=2086] Successfully activated service 'org.sigxcpu.Feedback' dbus-daemon[2086]: [session uid=999 pid=2086] Activating service name='org.mobian_project.CallAudio' requested by ':1.0' (uid=999 pid=2094 comm="/tmp/guix-build-calls-45.0.drv-0/build/tests/appli") (process:2178): callaudiod-pulse-CRITICAL **: 07:13:52.268: No suitable card found, stopping here... dbus-daemon[2086]: [session uid=999 pid=2086] Activated service 'org.mobian_project.CallAudio' failed: Process org.mobian_project.CallAudio received signal 5 My interpretation of this is the tests environment does not have audio set up. Is there something I can do? ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls. 2023-11-01 15:32 ` Vivien Kraus via Guix-patches via @ 2023-11-01 19:26 ` Maxim Cournoyer 0 siblings, 0 replies; 56+ messages in thread From: Maxim Cournoyer @ 2023-11-01 19:26 UTC (permalink / raw) To: Vivien Kraus; +Cc: rg, Liliana Marie Prikler, 66823 Hi Vivien! Vivien Kraus <vivien@planete-kraus.eu> writes: > Le mardi 31 octobre 2023 à 23:15 -0400, Maxim Cournoyer a écrit : >> Did you try wrapping the test execution in a dbus_run_session call? >> Maybe that's what is missing in the build environment? See for >> example >> libsecret, which has such a setup. > > The “application” fails: > > not ok /Calls/application/shutdown_no_daemon - CallsApplication-FATAL- > WARNING: Failed to init libcallaudio: Error calling StartServiceByName > for org.mobian_project.CallAudio: Process org.mobian_project.CallAudio > received signal 5 > Bail out! > stderr: > dbus-daemon[2086]: [session uid=999 pid=2086] Activating service > name='org.mobian_project.CallAudio' requested by ':1.0' (uid=999 > pid=2094 comm="/tmp/guix-build-calls-45.0.drv-0/build/tests/appli") > dbus-daemon[2086]: [session uid=999 pid=2086] Successfully activated > service 'org.mobian_project.CallAudio' > > (process:2130): callaudiod-pulse-CRITICAL **: 07:13:51.933: No suitable > card found, stopping here... > dbus-daemon[2086]: [session uid=999 pid=2086] Activating service > name='org.sigxcpu.Feedback' requested by ':1.0' (uid=999 pid=2094 > comm="/tmp/guix-build-calls-45.0.drv-0/build/tests/appli") > dbus-daemon[2086]: [session uid=999 pid=2086] Successfully activated > service 'org.sigxcpu.Feedback' > dbus-daemon[2086]: [session uid=999 pid=2086] Activating service > name='org.mobian_project.CallAudio' requested by ':1.0' (uid=999 > pid=2094 comm="/tmp/guix-build-calls-45.0.drv-0/build/tests/appli") > > (process:2178): callaudiod-pulse-CRITICAL **: 07:13:52.268: No suitable > card found, stopping here... > dbus-daemon[2086]: [session uid=999 pid=2086] Activated service > 'org.mobian_project.CallAudio' failed: Process > org.mobian_project.CallAudio received signal 5 > > My interpretation of this is the tests environment does not have audio > set up. Is there something I can do? Ah! Yes: Add a comment mentioning that an actual sound card is needed to run the integration tests, not available in the build environment :-) -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via ` (6 preceding siblings ...) 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via @ 2023-11-02 17:07 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via ` (6 more replies) 7 siblings, 7 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-11-02 17:07 UTC (permalink / raw) To: 66823, Liliana Marie Prikler, Maxim Cournoyer; +Cc: rg [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 1429 bytes --] Dear Guix, Here are the latest changes. The Feedbackd patch is not upstreamed yet, as my account on Purism’s Gitlab is not opened yet. If you have one, feel free to submit the patch, add the issue number, and reword the commit. Best regards, Vivien Vivien Kraus (6): gnu: Add gmobile. [WIP] gnu: feedbackd: Update to 0.2.1. gnu: Add sofia-sip. gnu: Add libcallaudio. gnu: Add libcall-ui. gnu: Add calls. gnu/local.mk | 5 + gnu/packages/gnome.scm | 143 +++++++++++++++++- .../calls-disable-application-test.patch | 72 +++++++++ .../patches/calls-disable-sip-test.patch | 44 ++++++ .../feedbackd-use-system-gmobile.patch | 42 +++++ .../patches/gmobile-make-it-installable.patch | 89 +++++++++++ .../libcall-ui-make-it-installable.patch | 81 ++++++++++ gnu/packages/telephony.scm | 105 +++++++++++++ 8 files changed, 578 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/calls-disable-application-test.patch create mode 100644 gnu/packages/patches/calls-disable-sip-test.patch create mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch create mode 100644 gnu/packages/patches/gmobile-make-it-installable.patch create mode 100644 gnu/packages/patches/libcall-ui-make-it-installable.patch base-commit: 2677bf985c0025d04ffdcff31763978b633dbc58 -- 2.41.0 ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 1/6] gnu: Add gmobile. 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via ` (5 subsequent siblings) 6 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: 66823, Liliana Marie Prikler, Maxim Cournoyer; +Cc: rg * 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: <c1ea43a45f4588f21752b0ad679c43350a9c8905.1698604357.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1. 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-11-02 18:08 ` Liliana Marie Prikler 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via ` (4 subsequent siblings) 6 siblings, 1 reply; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: 66823, Liliana Marie Prikler, Maxim Cournoyer; +Cc: rg * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. (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 | 42 +++++++++++++++++++ 3 files changed, 52 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..f0a0449472 --- /dev/null +++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch @@ -0,0 +1,42 @@ +From af9e72124b12ca481fd3592f9c8ea2649f7e4c80 Mon Sep 17 00:00:00 2001 +Message-ID: <af9e72124b12ca481fd3592f9c8ea2649f7e4c80.1698775513.git.vivien@planete-kraus.eu> +From: Vivien Kraus <vivien@planete-kraus.eu> +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. +--- +I am waiting for Purism to approve my account before I can report this. + + 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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1. 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-11-02 18:08 ` Liliana Marie Prikler 2023-11-07 15:45 ` Maxim Cournoyer 0 siblings, 1 reply; 56+ messages in thread From: Liliana Marie Prikler @ 2023-11-02 18:08 UTC (permalink / raw) To: Vivien Kraus, 66823, Maxim Cournoyer; +Cc: rg Am Dienstag, dem 31.10.2023 um 20:34 +0100 schrieb Vivien Kraus: > * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. > (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 > --- Reworded locally to * gnu/packages/patches/feedbackd-use-system-gmobile.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. [origin]<patches>: Add “feedbackd-use-system-gmobile.patch”. <snippet>: Remove the gmobile submodule. [inputs]: Add gmobile. IMHO it's not a hard requirement that you submit this upstream before pushing, so take your time with the account. That being said, I will need to rely on CI for builds on this series, because I also have a local world rebuild for this weekend. Cheers ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1. 2023-11-02 18:08 ` Liliana Marie Prikler @ 2023-11-07 15:45 ` Maxim Cournoyer 2023-11-07 16:54 ` Liliana Marie Prikler 0 siblings, 1 reply; 56+ messages in thread From: Maxim Cournoyer @ 2023-11-07 15:45 UTC (permalink / raw) To: Liliana Marie Prikler; +Cc: rg, Vivien Kraus, 66823 Hi Liliana, Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > Am Dienstag, dem 31.10.2023 um 20:34 +0100 schrieb Vivien Kraus: >> * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. >> (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 >> --- > Reworded locally to > > * gnu/packages/patches/feedbackd-use-system-gmobile.patch: New file. > * gnu/local.mk (dist_patch_DATA): Register it here. > * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. > [origin]<patches>: Add “feedbackd-use-system-gmobile.patch”. > <snippet>: Remove the gmobile submodule. > [inputs]: Add gmobile. > > IMHO it's not a hard requirement that you submit this upstream before > pushing, so take your time with the account. That being said, I will > need to rely on CI for builds on this series, because I also have a > local world rebuild for this weekend. On that topic: I like to think that upstreamable changes *should* be forwarded upstream; as the alternative is maintaining our own growing set of custom patches forever, which is not sustainable. -- Thanks, Maxim ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1. 2023-11-07 15:45 ` Maxim Cournoyer @ 2023-11-07 16:54 ` Liliana Marie Prikler 0 siblings, 0 replies; 56+ messages in thread From: Liliana Marie Prikler @ 2023-11-07 16:54 UTC (permalink / raw) To: Maxim Cournoyer; +Cc: rg, Vivien Kraus, 66823 Am Dienstag, dem 07.11.2023 um 10:45 -0500 schrieb Maxim Cournoyer: > Hi Liliana, > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes: > > > Am Dienstag, dem 31.10.2023 um 20:34 +0100 schrieb Vivien Kraus: > > > * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. > > > (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 > > > --- > > Reworded locally to > > > > * gnu/packages/patches/feedbackd-use-system-gmobile.patch: New > > file. > > * gnu/local.mk (dist_patch_DATA): Register it here. > > * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. > > [origin]<patches>: Add “feedbackd-use-system-gmobile.patch”. > > <snippet>: Remove the gmobile submodule. > > [inputs]: Add gmobile. > > > > IMHO it's not a hard requirement that you submit this upstream > > before pushing, so take your time with the account. That being > > said, I will need to rely on CI for builds on this series, because > > I also have a local world rebuild for this weekend. > > On that topic: I like to think that upstreamable changes *should* be > forwarded upstream; as the alternative is maintaining our own growing > set of custom patches forever, which is not sustainable. I agree; under the RFC 2119 definition of SHOULD. Cheers ^ permalink raw reply [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 3/6] gnu: Add sofia-sip. 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via ` (3 subsequent siblings) 6 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: 66823, Liliana Marie Prikler, Maxim Cournoyer; +Cc: rg [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 4489 bytes --] * gnu/packages/telephony.scm (sofia-sip): New variable. Change-Id: I18dd31fa62f5cfe528d7558915135f17d49b798d --- gnu/packages/telephony.scm | 80 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 42158784ca..dfa3343207 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,82 @@ (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 _ + ;; 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. (see: + ;; https://github.com/freeswitch/sofia-sip/issues/234) + (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))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 4/6] gnu: Add libcallaudio. 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via ` (2 preceding siblings ...) 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 ` Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v5 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via ` (2 subsequent siblings) 6 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:34 UTC (permalink / raw) To: 66823, Liliana Marie Prikler, Maxim Cournoyer; +Cc: rg * 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 dfa3343207..ef4baff81f 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 @@ -1168,3 +1169,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+))) -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 5/6] gnu: Add libcall-ui. 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via ` (3 preceding siblings ...) 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 ` Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v5 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 2023-11-02 18:11 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Liliana Marie Prikler 6 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 UTC (permalink / raw) To: 66823, Liliana Marie Prikler, Maxim Cournoyer; +Cc: rg [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 5697 bytes --] * 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 | 41 ++++++++++ .../libcall-ui-make-it-installable.patch | 81 +++++++++++++++++++ 3 files changed, 123 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..8b9c64126d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13479,3 +13479,44 @@ (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 <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 6/6] gnu: Add calls. 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via ` (4 preceding siblings ...) 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v5 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 ` Vivien Kraus via Guix-patches via 2023-11-02 18:11 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Liliana Marie Prikler 6 siblings, 0 replies; 56+ messages in thread From: Vivien Kraus via Guix-patches via @ 2023-10-31 19:35 UTC (permalink / raw) To: 66823, Liliana Marie Prikler, Maxim Cournoyer; +Cc: rg [-- Warning: decoded text below may be mangled, UTF-8 assumed --] [-- Attachment #1: Type: text/plain, Size: 9481 bytes --] * 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 | 65 ++++++++++++++++- .../calls-disable-application-test.patch | 72 +++++++++++++++++++ .../patches/calls-disable-sip-test.patch | 44 ++++++++++++ 4 files changed, 182 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 8b9c64126d..86d62c16b5 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 @@ -13520,3 +13521,65 @@ (define-public libcall-ui 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")))))) + (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..f06f747487 --- /dev/null +++ b/gnu/packages/patches/calls-disable-application-test.patch @@ -0,0 +1,72 @@ +From e0fdae20840ffe3aeca7190eb8b1bcae70f0c93b Mon Sep 17 00:00:00 2001 +From: Vivien Kraus <vivien@planete-kraus.eu> +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, because an actual +sound card is required to run this integration test. + +* 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 <vivien@planete-kraus.eu> +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 + -- 2.41.0 ^ permalink raw reply related [flat|nested] 56+ messages in thread
* [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via ` (5 preceding siblings ...) 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v5 6/6] gnu: Add calls Vivien Kraus via Guix-patches via @ 2023-11-02 18:11 ` Liliana Marie Prikler 2023-11-04 7:01 ` bug#66823: " Liliana Marie Prikler 6 siblings, 1 reply; 56+ messages in thread From: Liliana Marie Prikler @ 2023-11-02 18:11 UTC (permalink / raw) To: Vivien Kraus, 66823, Maxim Cournoyer; +Cc: rg Am Donnerstag, dem 02.11.2023 um 18:07 +0100 schrieb Vivien Kraus: > Dear Guix, > > Here are the latest changes. The Feedbackd patch is not upstreamed > yet, as my account on Purism’s Gitlab is not opened yet. If you have > one, feel free to submit the patch, add the issue number, and reword > the commit. This series LGTM with one change that I already noted on the relevant patch. CI seems to be confused about the long line – at the very least, that's to lines to my 'git am'. Cheers ^ permalink raw reply [flat|nested] 56+ messages in thread
* bug#66823: [PATCH gnome-team v5 0/6] Waiting for Purism 2023-11-02 18:11 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Liliana Marie Prikler @ 2023-11-04 7:01 ` Liliana Marie Prikler 0 siblings, 0 replies; 56+ messages in thread From: Liliana Marie Prikler @ 2023-11-04 7:01 UTC (permalink / raw) To: Vivien Kraus, 66823-done, Maxim Cournoyer; +Cc: rg Am Donnerstag, dem 02.11.2023 um 19:11 +0100 schrieb Liliana Marie Prikler: > Am Donnerstag, dem 02.11.2023 um 18:07 +0100 schrieb Vivien Kraus: > > Dear Guix, > > > > Here are the latest changes. The Feedbackd patch is not upstreamed > > yet, as my account on Purism’s Gitlab is not opened yet. If you > > have one, feel free to submit the patch, add the issue number, and > > reword the commit. > This series LGTM with one change that I already noted on the relevant > patch. CI seems to be confused about the long line – at the very > least, that's to lines to my 'git am'. > > Cheers Pushed now with the mentioned change. If you want to amend a comment, feel free to reopen. Cheers ^ permalink raw reply [flat|nested] 56+ messages in thread
end of thread, other threads:[~2023-11-07 16:55 UTC | newest] Thread overview: 56+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2023-10-29 16:44 [bug#66823] [PATCH gnome-team 0/4] Add GNOME Calls Vivien Kraus via Guix-patches via 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team 4/4] gnu: Add calls Vivien Kraus via Guix-patches via 2023-10-29 17:09 ` Liliana Marie Prikler 2023-10-31 14:21 ` Maxim Cournoyer 2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team 1/4] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via 2023-10-29 17:10 ` Liliana Marie Prikler 2023-10-31 13:54 ` Maxim Cournoyer 2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team 2/4] gnu: Add sofia-sip Vivien Kraus via Guix-patches via 2023-10-29 17:13 ` Liliana Marie Prikler 2023-10-31 14:00 ` Maxim Cournoyer 2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team 3/4] gnu: Add libcallaudio Vivien Kraus via Guix-patches via 2023-10-31 14:02 ` Maxim Cournoyer 2023-10-29 20:15 ` [bug#66823] [PATCH gnome-team v2 0/6] Add GNOME Calls, slightly better Vivien Kraus via Guix-patches via 2023-10-29 11:04 ` [bug#66823] [PATCH gnome-team v2 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 2023-10-31 14:43 ` Maxim Cournoyer 2023-10-29 16:32 ` [bug#66823] [PATCH gnome-team v2 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via 2023-10-31 14:38 ` Maxim Cournoyer 2023-10-29 16:34 ` [bug#66823] [PATCH gnome-team v2 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via 2023-10-29 16:36 ` [bug#66823] [PATCH gnome-team v2 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via 2023-10-29 18:34 ` [bug#66823] [PATCH gnome-team v2 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via 2023-10-31 14:30 ` Maxim Cournoyer 2023-10-29 19:05 ` [bug#66823] [PATCH gnome-team v2 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via 2023-10-31 14:40 ` Maxim Cournoyer 2023-10-31 19:36 ` [bug#66823] [PATCH gnome-team v3 0/6] Add Calls, and inform upstreams Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v3 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v3 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v3 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 2023-10-31 20:48 ` [bug#66823] [PATCH gnome-team v4 0/6] Add Calls Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 2/6] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via 2023-11-01 3:06 ` Maxim Cournoyer 2023-11-01 11:44 ` Liliana Marie Prikler 2023-11-01 15:30 ` Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via 2023-11-01 3:09 ` Maxim Cournoyer 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v4 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v4 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 2023-11-01 3:15 ` Maxim Cournoyer 2023-11-01 15:32 ` Vivien Kraus via Guix-patches via 2023-11-01 19:26 ` Maxim Cournoyer 2023-11-02 17:07 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 1/6] gnu: Add gmobile Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 2/6] [WIP] gnu: feedbackd: Update to 0.2.1 Vivien Kraus via Guix-patches via 2023-11-02 18:08 ` Liliana Marie Prikler 2023-11-07 15:45 ` Maxim Cournoyer 2023-11-07 16:54 ` Liliana Marie Prikler 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 3/6] gnu: Add sofia-sip Vivien Kraus via Guix-patches via 2023-10-31 19:34 ` [bug#66823] [PATCH gnome-team v5 4/6] gnu: Add libcallaudio Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v5 5/6] gnu: Add libcall-ui Vivien Kraus via Guix-patches via 2023-10-31 19:35 ` [bug#66823] [PATCH gnome-team v5 6/6] gnu: Add calls Vivien Kraus via Guix-patches via 2023-11-02 18:11 ` [bug#66823] [PATCH gnome-team v5 0/6] Waiting for Purism Liliana Marie Prikler 2023-11-04 7:01 ` bug#66823: " Liliana Marie Prikler
Code repositories for project(s) associated with this external index https://git.savannah.gnu.org/cgit/guix.git This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.