[Debian-on-mobile-maintainers] [Git][DebianOnMobile-team/gnome-calls][debian/master] 3 commits: d/patches: switch to the new callaudio API

[Henry-Nicolas Tourneur]

Henry-Nicolas Tourneur pushed to branch debian/master at Debian On Mobile / gnome-calls


Commits:
343ded38 by Arnaud Ferraris at 2021-01-15T16:58:03+01:00
d/patches: switch to the new callaudio API

As the latest callaudiod has been accepted to unstable, we should patch 
gnome-calls to use the new API to avoid FTBFS issues.

These patches are extracted for the corresponding upstream MR: 
https://source.puri.sm/Librem5/calls/-/merge_requests/230

- - - - -
94ee0446 by Arnaud Ferraris at 2021-01-15T16:58:38+01:00
d/control: add a minimum version requirement on libcallaudio dependency

- - - - -
fa16a600 by Henry-Nicolas Tourneur at 2021-01-15T17:16:27+00:00
Merge branch 'callaudio-update' into 'debian/master'

Add patch to use the new callaudio API

See merge request DebianOnMobile-team/gnome-calls!1
- - - - -


3 changed files:

- debian/control
- + debian/patches/0002-callaudio-api.patch
- debian/patches/series


Changes:

=====================================
debian/control
=====================================
@@ -10,7 +10,7 @@ Build-Depends:
  desktop-file-utils,
  gtk-doc-tools <!nodoc>,
  help2man,
- libcallaudio-dev,
+ libcallaudio-dev (>= 0.0.5),
  libebook-contacts1.2-dev,
  libfeedback-dev,
  libfolks-dev,


=====================================
debian/patches/0002-callaudio-api.patch
=====================================
@@ -0,0 +1,70 @@
+From eaed62151bd533a4021ba937a959464383ddc0cb Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris at collabora.com>
+Date: Tue, 12 Jan 2021 18:40:12 +0100
+Subject: [PATCH 1/2] call-display: update libcallaudio API calls
+
+Upstream modified the async API, make sure we use it.
+---
+ src/calls-call-display.c | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/calls-call-display.c b/src/calls-call-display.c
+index 7d17772..2bfb8fc 100644
+--- a/src/calls-call-display.c
++++ b/src/calls-call-display.c
+@@ -211,7 +211,7 @@ stop_timeout (CallsCallDisplay *self)
+ 
+ 
+ static void
+-select_mode_complete (gboolean success, GError *error)
++select_mode_complete (gboolean success, GError *error, gpointer data)
+ {
+   if (error)
+     {
+@@ -261,11 +261,15 @@ call_state_changed_cb (CallsCallDisplay *self,
+          state != CALLS_CALL_STATE_DIALING
+          && state != CALLS_CALL_STATE_ALERTING);
+ 
+-      call_audio_select_mode_async (CALL_AUDIO_MODE_CALL, select_mode_complete);
++      call_audio_select_mode_async (CALL_AUDIO_MODE_CALL,
++                                    select_mode_complete,
++                                    NULL);
+       break;
+ 
+     case CALLS_CALL_STATE_DISCONNECTED:
+-      call_audio_select_mode_async (CALL_AUDIO_MODE_DEFAULT, select_mode_complete);
++      call_audio_select_mode_async (CALL_AUDIO_MODE_DEFAULT,
++                                    select_mode_complete,
++                                    NULL);
+       break;
+     }
+ 
+-- 
+2.26.2
+
+
+From b371ee665c981c3ea9f398da04fdf1536560cae6 Mon Sep 17 00:00:00 2001
+From: Arnaud Ferraris <arnaud.ferraris at collabora.com>
+Date: Tue, 12 Jan 2021 18:42:29 +0100
+Subject: [PATCH 2/2] src: meson.build: update libcallaudio dependency
+
+---
+ src/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/meson.build b/src/meson.build
+index 6222432..9be8cd8 100644
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -36,7 +36,7 @@ calls_deps = [ dependency('gobject-2.0', version: '>= 2.58'),
+                dependency('gom-1.0'),
+                dependency('libebook-contacts-1.2'),
+                dependency('folks'),
+-               dependency('libcallaudio-0'),
++               dependency('libcallaudio-0.1'),
+              ]
+ 
+ if wl_scanner.found()
+-- 
+2.26.2
+


=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
 0000-fix-missing-main-category-from-desktop-file.patch
 0001-rename-binary.patch
+0002-callaudio-api.patch



View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/gnome-calls/-/compare/217f0417ebae0c44b5b232aa5b05fb1826c56646...fa16a6000dda431ce08e29fc089cb6efd3c876af

-- 
View it on GitLab: https://salsa.debian.org/DebianOnMobile-team/gnome-calls/-/compare/217f0417ebae0c44b5b232aa5b05fb1826c56646...fa16a6000dda431ce08e29fc089cb6efd3c876af
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-on-mobile-maintainers/attachments/20210115/37dae014/attachment-0001.html>