1 |
commit: 3e56a1d9f235673ba4058fd401c1fb449012ba82 |
2 |
Author: Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver <DOT> nl> |
3 |
AuthorDate: Sun Oct 10 09:59:02 2021 +0000 |
4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
5 |
CommitDate: Sun Oct 10 09:59:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3e56a1d9 |
7 |
|
8 |
net-voip/gnome-calls: Version bump to 41.0 |
9 |
|
10 |
Package-Manager: Portage-3.0.20, Repoman-3.0.3 |
11 |
Signed-off-by: Gerben Jan Dijkman <gjdijkman <AT> gjdwebserver.nl> |
12 |
|
13 |
net-voip/gnome-calls/Manifest | 2 +- |
14 |
...lay-use-PinePhone-s-device-for-ugly-hacks.patch | 61 ---- |
15 |
.../files/0001-use-at-cmds-to-mute.patch | 36 --- |
16 |
net-voip/gnome-calls/files/188.patch | 335 --------------------- |
17 |
net-voip/gnome-calls/files/230.patch | 126 -------- |
18 |
.../gnome-calls/files/add-call-back-button.patch | 37 --- |
19 |
net-voip/gnome-calls/files/calll-display.patch | 18 -- |
20 |
.../files/inhibit-suspend-during-call.patch | 63 ---- |
21 |
...-calls-0.3.4.ebuild => gnome-calls-41.0.ebuild} | 4 +- |
22 |
9 files changed, 3 insertions(+), 679 deletions(-) |
23 |
|
24 |
diff --git a/net-voip/gnome-calls/Manifest b/net-voip/gnome-calls/Manifest |
25 |
index 2306bcd27..0c6cee55c 100644 |
26 |
--- a/net-voip/gnome-calls/Manifest |
27 |
+++ b/net-voip/gnome-calls/Manifest |
28 |
@@ -1 +1 @@ |
29 |
-DIST calls-v0.3.4.tar.gz 203835 BLAKE2B dddafde2c5c1b247a603947679ed9335331ecfacbcdf73dbacc2f8542de783d8acdd398b0ab589680a24097d723dca731600a1886ed923be3889b00a60391ad5 SHA512 39463fcf493c8aeb428d41111adc957203dbcb57c033b2025c4932e52c8e158d17687df0ec13ffe4bf704b4c3ec75cdf3bfbacc6f839fd7193290d239df0df72 |
30 |
+DIST calls-41.0.tar.gz 224680 BLAKE2B 8f0312b2d3e214440fd1aae137afb2de13104c90a9d1d8aa041ca05ccce2a2c7ab5ce9cf1f0d7e06b383e82e9c2919e43c31d1aa7edb835c3beb336f8e0babda SHA512 6fdc8ad1c4fe3c38db1f4772e9dba2c3e7ee744a0ddb5b553c32f75be4fc8dde2cee15694f3027ec5dbaed10b36ef85a7f056e0fd6f91d1b26655a56f09c9c5d |
31 |
|
32 |
diff --git a/net-voip/gnome-calls/files/0001-call-display-use-PinePhone-s-device-for-ugly-hacks.patch b/net-voip/gnome-calls/files/0001-call-display-use-PinePhone-s-device-for-ugly-hacks.patch |
33 |
deleted file mode 100644 |
34 |
index fb4ef7d0f..000000000 |
35 |
--- a/net-voip/gnome-calls/files/0001-call-display-use-PinePhone-s-device-for-ugly-hacks.patch |
36 |
+++ /dev/null |
37 |
@@ -1,61 +0,0 @@ |
38 |
-From 6630fea2096118cf0566cfa9a7e07d2b977ffc86 Mon Sep 17 00:00:00 2001 |
39 |
-From: Arnaud Ferraris <arnaud.ferraris@×××××××××.com> |
40 |
-Date: Thu, 5 Mar 2020 15:06:44 +0100 |
41 |
-Subject: [PATCH 1/1] call-display: use PinePhone's device for ugly hacks |
42 |
- |
43 |
---- |
44 |
- src/calls-call-display.c | 18 +++++------------- |
45 |
- 1 file changed, 5 insertions(+), 13 deletions(-) |
46 |
- |
47 |
-diff --git a/src/calls-call-display.c b/src/calls-call-display.c |
48 |
-index 1d8f276..a60f24b 100644 |
49 |
---- a/src/calls-call-display.c |
50 |
-+++ b/src/calls-call-display.c |
51 |
-@@ -334,9 +334,9 @@ set_property (GObject *object, |
52 |
- //#define UGLY_SOURCE "alsa_input.platform-sound.VoiceCall__hw_CARD_sgtl5000__source" |
53 |
- //#define UGLY_SINK "alsa_output.platform-sound.VoiceCall__hw_CARD_sgtl5000__sink" |
54 |
- //#define UGLY_SPEAKER_PORT "Headset" |
55 |
--#define UGLY_SOURCE "alsa_input.platform-sound.Audio__hw_CARD_wm8962__source" |
56 |
--#define UGLY_SINK "alsa_output.platform-sound.Audio__hw_CARD_wm8962__sink" |
57 |
--#define UGLY_SPEAKER_PORT "SpeakerPhone" |
58 |
-+#define UGLY_SOURCE "alsa_input.platform-sound.Voice_Call__hw_PinePhone_0__source" |
59 |
-+#define UGLY_SINK "alsa_output.platform-sound.Voice_Call__hw_PinePhone_0__sink" |
60 |
-+#define UGLY_SPEAKER_PORT "Speaker" |
61 |
- |
62 |
- |
63 |
- static gboolean |
64 |
-@@ -413,21 +413,13 @@ ugly_speaker_pressed_cb (CallsCallDisplay *self, |
65 |
- |
66 |
- if (gtk_toggle_button_get_active (speaker)) |
67 |
- { |
68 |
-- port = "Handset"; |
69 |
-+ port = "Earpiece"; |
70 |
- } |
71 |
- else |
72 |
- { |
73 |
- port = UGLY_SPEAKER_PORT; |
74 |
- } |
75 |
- |
76 |
-- ok = ugly_set_pa_port ("source", UGLY_SOURCE, |
77 |
-- "In", port); |
78 |
-- if (!ok) |
79 |
-- { |
80 |
-- /* Stop other handlers */ |
81 |
-- return TRUE; |
82 |
-- } |
83 |
-- |
84 |
- ok = ugly_set_pa_port ("sink", UGLY_SINK, |
85 |
- "Out", port); |
86 |
- if (!ok) |
87 |
-@@ -599,7 +591,7 @@ calls_call_display_class_init (CallsCallDisplayClass *klass) |
88 |
- "Data for the call this display will be associated with", |
89 |
- CALLS_TYPE_CALL_DATA, |
90 |
- G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY); |
91 |
-- |
92 |
-+ |
93 |
- g_object_class_install_properties (object_class, PROP_LAST_PROP, props); |
94 |
- |
95 |
- |
96 |
--- |
97 |
-2.20.1 |
98 |
- |
99 |
|
100 |
diff --git a/net-voip/gnome-calls/files/0001-use-at-cmds-to-mute.patch b/net-voip/gnome-calls/files/0001-use-at-cmds-to-mute.patch |
101 |
deleted file mode 100644 |
102 |
index cb1aa14c2..000000000 |
103 |
--- a/net-voip/gnome-calls/files/0001-use-at-cmds-to-mute.patch |
104 |
+++ /dev/null |
105 |
@@ -1,36 +0,0 @@ |
106 |
-diff --git a/src/calls-call-display.c b/src/calls-call-display.c |
107 |
-index bf98958..c8b1bc4 100644 |
108 |
---- a/src/calls-call-display.c |
109 |
-+++ b/src/calls-call-display.c |
110 |
-@@ -34,6 +34,8 @@ |
111 |
- |
112 |
- #include <libcallaudio.h> |
113 |
- |
114 |
-+#include <stdlib.h> |
115 |
-+ |
116 |
- struct _CallsCallDisplay |
117 |
- { |
118 |
- GtkOverlay parent_instance; |
119 |
-@@ -103,11 +105,17 @@ mute_toggled_cb (GtkToggleButton *togglebutton, |
120 |
- g_autoptr (GError) error = NULL; |
121 |
- |
122 |
- want_mute = gtk_toggle_button_get_active (togglebutton); |
123 |
-- ret = call_audio_mute_mic (want_mute, &error); |
124 |
-- if (!ret && error) |
125 |
-- g_warning ("Failed to %smute microphone: %s", |
126 |
-- want_mute ? "" : "un", |
127 |
-- error->message); |
128 |
-+ |
129 |
-+ gchar* command = g_strdup_printf("/usr/bin/mmcli -m 0 --command=AT+CMUT=%d",want_mute?1:0); |
130 |
-+ |
131 |
-+ int exit_code; |
132 |
-+ |
133 |
-+ ret = g_spawn_command_line_sync(command, NULL,NULL,&exit_code, &error); |
134 |
-+ |
135 |
-+ if(!ret || error || exit_code != 0){ |
136 |
-+ g_warning ("Failed to %smute microphone (mmcli exit code: %d)", |
137 |
-+ want_mute ? "" : "un", exit_code); |
138 |
-+ } |
139 |
- } |
140 |
- |
141 |
- |
142 |
|
143 |
diff --git a/net-voip/gnome-calls/files/188.patch b/net-voip/gnome-calls/files/188.patch |
144 |
deleted file mode 100644 |
145 |
index 60717ded5..000000000 |
146 |
--- a/net-voip/gnome-calls/files/188.patch |
147 |
+++ /dev/null |
148 |
@@ -1,335 +0,0 @@ |
149 |
-From 5c0a588da7a0ffa57c8893650432804ff2663800 Mon Sep 17 00:00:00 2001 |
150 |
-From: Nazarii Kretovych <nazarii.kretovych@×××××.com> |
151 |
-Date: Sun, 20 Sep 2020 11:53:43 +0300 |
152 |
-Subject: [PATCH 1/3] Remove adding country code to tel number while dialing. |
153 |
- |
154 |
-Fixes #176 |
155 |
- |
156 |
-Signed-off-by: Nazarii Kretovych <nazarii.kretovych@×××××.com> |
157 |
---- |
158 |
- src/calls-application.c | 23 ++++++++++++++++++----- |
159 |
- 1 file changed, 18 insertions(+), 5 deletions(-) |
160 |
- |
161 |
-diff --git a/src/calls-application.c b/src/calls-application.c |
162 |
-index c9a9251..796c8cd 100644 |
163 |
---- a/src/calls-application.c |
164 |
-+++ b/src/calls-application.c |
165 |
-@@ -393,7 +393,6 @@ open_tel_uri (CallsApplication *self, |
166 |
- { |
167 |
- EPhoneNumber *number; |
168 |
- GError *error = NULL; |
169 |
-- gchar *dial_str; |
170 |
- |
171 |
- g_debug ("Opening tel URI `%s'", uri); |
172 |
- |
173 |
-@@ -405,14 +404,28 @@ open_tel_uri (CallsApplication *self, |
174 |
- g_error_free (error); |
175 |
- return; |
176 |
- } |
177 |
-- |
178 |
-- dial_str = e_phone_number_to_string |
179 |
-- (number, E_PHONE_NUMBER_FORMAT_E164); |
180 |
- e_phone_number_free (number); |
181 |
- |
182 |
-+ // Get dial string. |
183 |
-+ const size_t uri_len = strlen(uri); |
184 |
-+ gchar dial_str[uri_len + 1]; |
185 |
-+ gchar *p_dial_str = dial_str; |
186 |
-+ for (const gchar *p_uri = uri; *p_uri; p_uri++) { |
187 |
-+ const gchar ch = *p_uri; |
188 |
-+ if ((ch >= '0' && ch <= '9') || ch == '+') { |
189 |
-+ *p_dial_str = ch; |
190 |
-+ p_dial_str++; |
191 |
-+ } |
192 |
-+ } |
193 |
-+ if (p_dial_str == dial_str) { |
194 |
-+ // dial_str is empty, so we return. |
195 |
-+ g_warning("Failed to create dial string for tel URI '%s'", uri); |
196 |
-+ return; |
197 |
-+ } |
198 |
-+ *p_dial_str = '\0'; |
199 |
-+ |
200 |
- calls_main_window_dial (self->main_window, |
201 |
- dial_str); |
202 |
-- g_free (dial_str); |
203 |
- } |
204 |
- |
205 |
- |
206 |
--- |
207 |
-2.26.2 |
208 |
- |
209 |
- |
210 |
-From dedf8f820753d48575db6ec1774ed19783d66e65 Mon Sep 17 00:00:00 2001 |
211 |
-From: Nazarii Kretovych <nazarii.kretovych@×××××.com> |
212 |
-Date: Sat, 26 Sep 2020 17:21:54 +0300 |
213 |
-Subject: [PATCH 2/3] Fix: make open_tel_uri generate the proper dial string |
214 |
- for tel URIs that have the 'phone-context' param. |
215 |
- |
216 |
-Signed-off-by: Nazarii Kretovych <nazarii.kretovych@×××××.com> |
217 |
---- |
218 |
- .gitignore | 3 ++- |
219 |
- src/calls-application.c | 15 +++++++++++++++ |
220 |
- 2 files changed, 17 insertions(+), 1 deletion(-) |
221 |
- |
222 |
-diff --git a/.gitignore b/.gitignore |
223 |
-index 826102b..29e7ed5 100644 |
224 |
---- a/.gitignore |
225 |
-+++ b/.gitignore |
226 |
-@@ -5,4 +5,5 @@ _build |
227 |
- .\#* |
228 |
- build |
229 |
- .buildconfig |
230 |
--.flatpak-builder |
231 |
-\ No newline at end of file |
232 |
-+.flatpak-builder |
233 |
-+/nbproject/ |
234 |
-\ No newline at end of file |
235 |
-diff --git a/src/calls-application.c b/src/calls-application.c |
236 |
-index 796c8cd..591681a 100644 |
237 |
---- a/src/calls-application.c |
238 |
-+++ b/src/calls-application.c |
239 |
-@@ -410,11 +410,26 @@ open_tel_uri (CallsApplication *self, |
240 |
- const size_t uri_len = strlen(uri); |
241 |
- gchar dial_str[uri_len + 1]; |
242 |
- gchar *p_dial_str = dial_str; |
243 |
-+ const gchar *p_phone_context = strstr(uri, ";phone-context="); |
244 |
-+ if (p_phone_context) { |
245 |
-+ // uri has the 'phone-context' param. Add its value to dial_str. |
246 |
-+ for (p_phone_context += 15; *p_phone_context; p_phone_context++) { |
247 |
-+ const gchar ch = *p_phone_context; |
248 |
-+ if ((ch >= '0' && ch <= '9') || ch == '+') { |
249 |
-+ *p_dial_str = ch; |
250 |
-+ p_dial_str++; |
251 |
-+ } else if (ch == ';') { |
252 |
-+ break; |
253 |
-+ } |
254 |
-+ } |
255 |
-+ } |
256 |
- for (const gchar *p_uri = uri; *p_uri; p_uri++) { |
257 |
- const gchar ch = *p_uri; |
258 |
- if ((ch >= '0' && ch <= '9') || ch == '+') { |
259 |
- *p_dial_str = ch; |
260 |
- p_dial_str++; |
261 |
-+ } else if (ch == ';') { |
262 |
-+ break; |
263 |
- } |
264 |
- } |
265 |
- if (p_dial_str == dial_str) { |
266 |
--- |
267 |
-2.26.2 |
268 |
- |
269 |
- |
270 |
-From b29dbc9bc4038b8e0ee2e2f8f0d69e46f757297a Mon Sep 17 00:00:00 2001 |
271 |
-From: Nazarii Kretovych <nazarii.kretovych@×××××.com> |
272 |
-Date: Sat, 26 Sep 2020 20:22:40 +0300 |
273 |
-Subject: [PATCH 3/3] Move code of tel uri parser to separate function and add |
274 |
- unit test. |
275 |
- |
276 |
-Signed-off-by: Nazarii Kretovych <nazarii.kretovych@×××××.com> |
277 |
---- |
278 |
- src/calls-application.c | 81 ++++++++++++++++++++++++++-------------- |
279 |
- src/calls-application.h | 1 + |
280 |
- tests/meson.build | 14 +++++++ |
281 |
- tests/test-application.c | 51 +++++++++++++++++++++++++ |
282 |
- 4 files changed, 118 insertions(+), 29 deletions(-) |
283 |
- create mode 100644 tests/test-application.c |
284 |
- |
285 |
-diff --git a/src/calls-application.c b/src/calls-application.c |
286 |
-index 591681a..9665a62 100644 |
287 |
---- a/src/calls-application.c |
288 |
-+++ b/src/calls-application.c |
289 |
-@@ -387,6 +387,53 @@ activate (GApplication *application) |
290 |
- } |
291 |
- |
292 |
- |
293 |
-+gchar * |
294 |
-+parse_tel_uri_and_get_dial_str (const gchar *uri) |
295 |
-+{ |
296 |
-+ // Get dial string. |
297 |
-+ const size_t uri_len = strlen(uri); |
298 |
-+ gchar *dial_str = g_new(gchar, uri_len + 1); |
299 |
-+ gchar *p_dial_str = dial_str; |
300 |
-+ const gchar *p_phone_context = strstr(uri, ";phone-context="); |
301 |
-+ if (p_phone_context) |
302 |
-+ { |
303 |
-+ // uri has the 'phone-context' param. Add its value to dial_str. |
304 |
-+ for (p_phone_context += 15; *p_phone_context; p_phone_context++) |
305 |
-+ { |
306 |
-+ const gchar ch = *p_phone_context; |
307 |
-+ if ((ch >= '0' && ch <= '9') || ch == '+') |
308 |
-+ { |
309 |
-+ *p_dial_str = ch; |
310 |
-+ p_dial_str++; |
311 |
-+ } |
312 |
-+ else if (ch == ';') |
313 |
-+ { |
314 |
-+ break; |
315 |
-+ } |
316 |
-+ } |
317 |
-+ } |
318 |
-+ for (const gchar *p_uri = uri; *p_uri; p_uri++) |
319 |
-+ { |
320 |
-+ const gchar ch = *p_uri; |
321 |
-+ if ((ch >= '0' && ch <= '9') || ch == '+') |
322 |
-+ { |
323 |
-+ *p_dial_str = ch; |
324 |
-+ p_dial_str++; |
325 |
-+ } |
326 |
-+ else if (ch == ';') |
327 |
-+ { |
328 |
-+ break; |
329 |
-+ } |
330 |
-+ } |
331 |
-+ *p_dial_str = '\0'; |
332 |
-+ if (!*dial_str) { |
333 |
-+ g_free(dial_str); |
334 |
-+ dial_str = NULL; |
335 |
-+ } |
336 |
-+ |
337 |
-+ return dial_str; |
338 |
-+} |
339 |
-+ |
340 |
- static void |
341 |
- open_tel_uri (CallsApplication *self, |
342 |
- const gchar *uri) |
343 |
-@@ -407,40 +454,16 @@ open_tel_uri (CallsApplication *self, |
344 |
- e_phone_number_free (number); |
345 |
- |
346 |
- // Get dial string. |
347 |
-- const size_t uri_len = strlen(uri); |
348 |
-- gchar dial_str[uri_len + 1]; |
349 |
-- gchar *p_dial_str = dial_str; |
350 |
-- const gchar *p_phone_context = strstr(uri, ";phone-context="); |
351 |
-- if (p_phone_context) { |
352 |
-- // uri has the 'phone-context' param. Add its value to dial_str. |
353 |
-- for (p_phone_context += 15; *p_phone_context; p_phone_context++) { |
354 |
-- const gchar ch = *p_phone_context; |
355 |
-- if ((ch >= '0' && ch <= '9') || ch == '+') { |
356 |
-- *p_dial_str = ch; |
357 |
-- p_dial_str++; |
358 |
-- } else if (ch == ';') { |
359 |
-- break; |
360 |
-- } |
361 |
-- } |
362 |
-- } |
363 |
-- for (const gchar *p_uri = uri; *p_uri; p_uri++) { |
364 |
-- const gchar ch = *p_uri; |
365 |
-- if ((ch >= '0' && ch <= '9') || ch == '+') { |
366 |
-- *p_dial_str = ch; |
367 |
-- p_dial_str++; |
368 |
-- } else if (ch == ';') { |
369 |
-- break; |
370 |
-- } |
371 |
-- } |
372 |
-- if (p_dial_str == dial_str) { |
373 |
-- // dial_str is empty, so we return. |
374 |
-- g_warning("Failed to create dial string for tel URI '%s'", uri); |
375 |
-+ gchar *dial_str = parse_tel_uri_and_get_dial_str (uri); |
376 |
-+ if (!dial_str) { |
377 |
-+ g_warning ("Failed to create dial string for tel URI '%s'", uri); |
378 |
- return; |
379 |
- } |
380 |
-- *p_dial_str = '\0'; |
381 |
- |
382 |
- calls_main_window_dial (self->main_window, |
383 |
- dial_str); |
384 |
-+ |
385 |
-+ g_free (dial_str); |
386 |
- } |
387 |
- |
388 |
- |
389 |
-diff --git a/src/calls-application.h b/src/calls-application.h |
390 |
-index 08c3c56..26cf6c8 100644 |
391 |
---- a/src/calls-application.h |
392 |
-+++ b/src/calls-application.h |
393 |
-@@ -34,5 +34,6 @@ G_BEGIN_DECLS |
394 |
- G_DECLARE_FINAL_TYPE (CallsApplication, calls_application, CALLS, APPLICATION, GtkApplication) |
395 |
- |
396 |
- CallsApplication *calls_application_new (void); |
397 |
-+gchar *parse_tel_uri_and_get_dial_str (const gchar *); |
398 |
- |
399 |
- G_END_DECLS |
400 |
-diff --git a/tests/meson.build b/tests/meson.build |
401 |
-index 618b1c4..5cf581d 100644 |
402 |
---- a/tests/meson.build |
403 |
-+++ b/tests/meson.build |
404 |
-@@ -71,5 +71,19 @@ t = executable('manager', test_sources, |
405 |
- ) |
406 |
- test('manager', t, env: test_env) |
407 |
- |
408 |
-+test_sources = [ 'test-application.c' ] |
409 |
-+ |
410 |
-+t = executable('application', test_sources, |
411 |
-+ calls_sources, calls_enum_sources, calls_resources, |
412 |
-+ wl_proto_sources, wayland_sources, |
413 |
-+ c_args : test_cflags, |
414 |
-+ link_args: test_link_args, |
415 |
-+ link_with : calls_vala, |
416 |
-+ dependencies: calls_deps, |
417 |
-+ include_directories : [ |
418 |
-+ calls_includes |
419 |
-+ ] |
420 |
-+ ) |
421 |
-+test('application', t, env: test_env) |
422 |
- |
423 |
- endif |
424 |
-diff --git a/tests/test-application.c b/tests/test-application.c |
425 |
-new file mode 100644 |
426 |
-index 0000000..ffd192e |
427 |
---- /dev/null |
428 |
-+++ b/tests/test-application.c |
429 |
-@@ -0,0 +1,51 @@ |
430 |
-+/* |
431 |
-+ * Copyright (C) 2020 Purism SPC |
432 |
-+ * |
433 |
-+ * SPDX-License-Identifier: GPL-3.0+ |
434 |
-+ */ |
435 |
-+ |
436 |
-+#include "calls-application.h" |
437 |
-+ |
438 |
-+#include <gtk/gtk.h> |
439 |
-+#include <libpeas/peas.h> |
440 |
-+ |
441 |
-+static void |
442 |
-+test_calls_application_parse_tel_uri_and_get_dial_str () |
443 |
-+{ |
444 |
-+ gchar *dial_str; |
445 |
-+ |
446 |
-+ // Test 1. |
447 |
-+ dial_str = parse_tel_uri_and_get_dial_str ("tel:123-456-789;phone-context=+48"); |
448 |
-+ g_assert_true (g_strcmp0 (dial_str, "+48123456789") == 0); |
449 |
-+ g_free(dial_str); |
450 |
-+ |
451 |
-+ // Test 2. |
452 |
-+ dial_str = parse_tel_uri_and_get_dial_str ("tel:+38-096-123-45-67"); |
453 |
-+ g_assert_true (g_strcmp0 (dial_str, "+380961234567") == 0); |
454 |
-+ g_free(dial_str); |
455 |
-+ |
456 |
-+ // Test 3. |
457 |
-+ dial_str = parse_tel_uri_and_get_dial_str ("tel:0-800-123-456"); |
458 |
-+ g_assert_true (g_strcmp0 (dial_str, "0800123456") == 0); |
459 |
-+ g_free(dial_str); |
460 |
-+ |
461 |
-+ // Test 4. |
462 |
-+ dial_str = parse_tel_uri_and_get_dial_str ("tel:447"); |
463 |
-+ g_assert_true (g_strcmp0 (dial_str, "447") == 0); |
464 |
-+ g_free(dial_str); |
465 |
-+} |
466 |
-+ |
467 |
-+gint |
468 |
-+main (gint argc, gchar *argv[]) |
469 |
-+{ |
470 |
-+ gtk_test_init (&argc, &argv, NULL); |
471 |
-+ |
472 |
-+ /* Add builddir as search path */ |
473 |
-+#ifdef PLUGIN_BUILDDIR |
474 |
-+ peas_engine_add_search_path (peas_engine_get_default (), PLUGIN_BUILDDIR, NULL); |
475 |
-+#endif |
476 |
-+ |
477 |
-+ g_test_add_func("/Calls/Application/parse_tel_uri_and_get_dial_str", test_calls_application_parse_tel_uri_and_get_dial_str); |
478 |
-+ |
479 |
-+ return g_test_run(); |
480 |
-+} |
481 |
--- |
482 |
-2.26.2 |
483 |
- |
484 |
|
485 |
diff --git a/net-voip/gnome-calls/files/230.patch b/net-voip/gnome-calls/files/230.patch |
486 |
deleted file mode 100644 |
487 |
index 1ab15515a..000000000 |
488 |
--- a/net-voip/gnome-calls/files/230.patch |
489 |
+++ /dev/null |
490 |
@@ -1,126 +0,0 @@ |
491 |
-From eaed62151bd533a4021ba937a959464383ddc0cb Mon Sep 17 00:00:00 2001 |
492 |
-From: Arnaud Ferraris <arnaud.ferraris@×××××××××.com> |
493 |
-Date: Tue, 12 Jan 2021 18:40:12 +0100 |
494 |
-Subject: [PATCH 1/4] call-display: update libcallaudio API calls |
495 |
- |
496 |
-Upstream modified the async API, make sure we use it. |
497 |
---- |
498 |
- src/calls-call-display.c | 10 +++++++--- |
499 |
- 1 file changed, 7 insertions(+), 3 deletions(-) |
500 |
- |
501 |
-diff --git a/src/calls-call-display.c b/src/calls-call-display.c |
502 |
-index 7d17772..2bfb8fc 100644 |
503 |
---- a/src/calls-call-display.c |
504 |
-+++ b/src/calls-call-display.c |
505 |
-@@ -211,7 +211,7 @@ stop_timeout (CallsCallDisplay *self) |
506 |
- |
507 |
- |
508 |
- static void |
509 |
--select_mode_complete (gboolean success, GError *error) |
510 |
-+select_mode_complete (gboolean success, GError *error, gpointer data) |
511 |
- { |
512 |
- if (error) |
513 |
- { |
514 |
-@@ -261,11 +261,15 @@ call_state_changed_cb (CallsCallDisplay *self, |
515 |
- state != CALLS_CALL_STATE_DIALING |
516 |
- && state != CALLS_CALL_STATE_ALERTING); |
517 |
- |
518 |
-- call_audio_select_mode_async (CALL_AUDIO_MODE_CALL, select_mode_complete); |
519 |
-+ call_audio_select_mode_async (CALL_AUDIO_MODE_CALL, |
520 |
-+ select_mode_complete, |
521 |
-+ NULL); |
522 |
- break; |
523 |
- |
524 |
- case CALLS_CALL_STATE_DISCONNECTED: |
525 |
-- call_audio_select_mode_async (CALL_AUDIO_MODE_DEFAULT, select_mode_complete); |
526 |
-+ call_audio_select_mode_async (CALL_AUDIO_MODE_DEFAULT, |
527 |
-+ select_mode_complete, |
528 |
-+ NULL); |
529 |
- break; |
530 |
- } |
531 |
- |
532 |
--- |
533 |
-2.26.2 |
534 |
- |
535 |
- |
536 |
-From b371ee665c981c3ea9f398da04fdf1536560cae6 Mon Sep 17 00:00:00 2001 |
537 |
-From: Arnaud Ferraris <arnaud.ferraris@×××××××××.com> |
538 |
-Date: Tue, 12 Jan 2021 18:42:29 +0100 |
539 |
-Subject: [PATCH 2/4] src: meson.build: update libcallaudio dependency |
540 |
- |
541 |
---- |
542 |
- src/meson.build | 2 +- |
543 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
544 |
- |
545 |
-diff --git a/src/meson.build b/src/meson.build |
546 |
-index 6222432..9be8cd8 100644 |
547 |
---- a/src/meson.build |
548 |
-+++ b/src/meson.build |
549 |
-@@ -36,7 +36,7 @@ calls_deps = [ dependency('gobject-2.0', version: '>= 2.58'), |
550 |
- dependency('gom-1.0'), |
551 |
- dependency('libebook-contacts-1.2'), |
552 |
- dependency('folks'), |
553 |
-- dependency('libcallaudio-0'), |
554 |
-+ dependency('libcallaudio-0.1'), |
555 |
- ] |
556 |
- |
557 |
- if wl_scanner.found() |
558 |
--- |
559 |
-2.26.2 |
560 |
- |
561 |
- |
562 |
-From 2f37394f2e4d3947db967abfa7257cb563b5b4cd Mon Sep 17 00:00:00 2001 |
563 |
-From: Arnaud Ferraris <arnaud.ferraris@×××××××××.com> |
564 |
-Date: Tue, 12 Jan 2021 18:45:22 +0100 |
565 |
-Subject: [PATCH 3/4] d/control: add version requirement on libcallaudio build |
566 |
- dependency |
567 |
- |
568 |
-The new API appeared in version 0.0.5. |
569 |
---- |
570 |
- debian/control | 2 +- |
571 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
572 |
- |
573 |
-diff --git a/debian/control b/debian/control |
574 |
-index dc26174..1804e63 100644 |
575 |
---- a/debian/control |
576 |
-+++ b/debian/control |
577 |
-@@ -8,7 +8,7 @@ Build-Depends: |
578 |
- debhelper (>= 11), |
579 |
- desktop-file-utils, |
580 |
- gtk-doc-tools <!nodoc>, |
581 |
-- libcallaudio-dev, |
582 |
-+ libcallaudio-dev (>= 0.0.5), |
583 |
- libfeedback-dev, |
584 |
- libhandy-1-dev (>= 1.0.0), |
585 |
- libgtk-3-dev, |
586 |
--- |
587 |
-2.26.2 |
588 |
- |
589 |
- |
590 |
-From 5d3ee0acbda6f15c31e9538287ce9323ded19b37 Mon Sep 17 00:00:00 2001 |
591 |
-From: Arnaud Ferraris <arnaud.ferraris@×××××.com> |
592 |
-Date: Tue, 19 Jan 2021 22:13:54 +0100 |
593 |
-Subject: [PATCH 4/4] flatpak: update callaudiod version |
594 |
- |
595 |
---- |
596 |
- sm.puri.Calls.json | 4 ++-- |
597 |
- 1 file changed, 2 insertions(+), 2 deletions(-) |
598 |
- |
599 |
-diff --git a/sm.puri.Calls.json b/sm.puri.Calls.json |
600 |
-index da08789..10e5a36 100644 |
601 |
---- a/sm.puri.Calls.json |
602 |
-+++ b/sm.puri.Calls.json |
603 |
-@@ -267,8 +267,8 @@ |
604 |
- "sources" : [ |
605 |
- { |
606 |
- "type" : "archive", |
607 |
-- "url" : "https://gitlab.com/mobian1/callaudiod/-/archive/0.0.4/callaudiod-0.0.4.tar.gz", |
608 |
-- "sha256" : "a9620dee2999fa85a7ca8f0314be3317a99fc225439ac193d5f727ff9397f93d" |
609 |
-+ "url" : "https://gitlab.com/mobian1/callaudiod/-/archive/0.0.5/callaudiod-0.0.5.tar.gz", |
610 |
-+ "sha256" : "0016a5800749d408dbaa14d8a7886bf492068d56508c83a352dee9b1920754b4" |
611 |
- } |
612 |
- ] |
613 |
- }, |
614 |
--- |
615 |
-2.26.2 |
616 |
- |
617 |
|
618 |
diff --git a/net-voip/gnome-calls/files/add-call-back-button.patch b/net-voip/gnome-calls/files/add-call-back-button.patch |
619 |
deleted file mode 100644 |
620 |
index cbff43aba..000000000 |
621 |
--- a/net-voip/gnome-calls/files/add-call-back-button.patch |
622 |
+++ /dev/null |
623 |
@@ -1,37 +0,0 @@ |
624 |
-From c43bfe3ebb9c0f98c143b8b3e777058d5c1c11e3 Mon Sep 17 00:00:00 2001 |
625 |
-From: Evangelos Ribeiro Tzaras <devrtz@××××××××××××××.eu> |
626 |
-Date: Tue, 8 Sep 2020 05:10:11 +0200 |
627 |
-Subject: [PATCH] src/calls-notifier.c: Add call-back button |
628 |
- |
629 |
---- |
630 |
- src/calls-notifier.c | 7 +++++++ |
631 |
- 1 file changed, 7 insertions(+) |
632 |
- |
633 |
-diff --git a/src/calls-notifier.c b/src/calls-notifier.c |
634 |
-index 292c559..076e2c6 100644 |
635 |
---- a/src/calls-notifier.c |
636 |
-+++ b/src/calls-notifier.c |
637 |
-@@ -46,6 +46,7 @@ notify (CallsNotifier *self, CallsCall *call) |
638 |
- g_autoptr(GNotification) notification; |
639 |
- g_autofree gchar *msg = NULL; |
640 |
- g_autofree gchar *ref = NULL; |
641 |
-+ g_autofree gchar *label_callback = NULL; |
642 |
- const char *name; |
643 |
- |
644 |
- notification = g_notification_new (_("Missed call")); |
645 |
-@@ -57,6 +58,12 @@ notify (CallsNotifier *self, CallsCall *call) |
646 |
- msg = g_strdup_printf (_("Missed call from %s"), calls_call_get_number (call)); |
647 |
- |
648 |
- g_notification_set_body (notification, msg); |
649 |
-+ |
650 |
-+ if (calls_call_get_number (call)) { |
651 |
-+ label_callback = g_strdup_printf ("app.dial::%s", calls_call_get_number (call)); |
652 |
-+ g_notification_add_button (notification, _("Call back"), label_callback); |
653 |
-+ } |
654 |
-+ |
655 |
- ref = g_strdup_printf ("missed-call-%s", calls_call_get_number (call) ?: "unknown"); |
656 |
- g_application_send_notification (app, ref, notification); |
657 |
- } |
658 |
--- |
659 |
-2.26.2 |
660 |
- |
661 |
|
662 |
diff --git a/net-voip/gnome-calls/files/calll-display.patch b/net-voip/gnome-calls/files/calll-display.patch |
663 |
deleted file mode 100644 |
664 |
index 3573a9171..000000000 |
665 |
--- a/net-voip/gnome-calls/files/calll-display.patch |
666 |
+++ /dev/null |
667 |
@@ -1,18 +0,0 @@ |
668 |
-diff --git a/src/calls-call-display.c b/src/calls-call-display.c |
669 |
-index 7d17772..f4aa855 100644 |
670 |
---- a/src/calls-call-display.c |
671 |
-+++ b/src/calls-call-display.c |
672 |
-@@ -261,11 +261,11 @@ call_state_changed_cb (CallsCallDisplay *self, |
673 |
- state != CALLS_CALL_STATE_DIALING |
674 |
- && state != CALLS_CALL_STATE_ALERTING); |
675 |
- |
676 |
-- call_audio_select_mode_async (CALL_AUDIO_MODE_CALL, select_mode_complete); |
677 |
-+ call_audio_select_mode_async (CALL_AUDIO_MODE_CALL, select_mode_complete, NULL); |
678 |
- break; |
679 |
- |
680 |
- case CALLS_CALL_STATE_DISCONNECTED: |
681 |
-- call_audio_select_mode_async (CALL_AUDIO_MODE_DEFAULT, select_mode_complete); |
682 |
-+ call_audio_select_mode_async (CALL_AUDIO_MODE_DEFAULT, select_mode_complete, NULL); |
683 |
- break; |
684 |
- } |
685 |
- |
686 |
|
687 |
diff --git a/net-voip/gnome-calls/files/inhibit-suspend-during-call.patch b/net-voip/gnome-calls/files/inhibit-suspend-during-call.patch |
688 |
deleted file mode 100644 |
689 |
index 15836585f..000000000 |
690 |
--- a/net-voip/gnome-calls/files/inhibit-suspend-during-call.patch |
691 |
+++ /dev/null |
692 |
@@ -1,63 +0,0 @@ |
693 |
-From 9619ebb674771206662f099901c617edb54b870a Mon Sep 17 00:00:00 2001 |
694 |
-From: Evangelos Ribeiro Tzaras <devrtz@××××××××××××××.eu> |
695 |
-Date: Thu, 6 Aug 2020 22:28:37 +0200 |
696 |
-Subject: [PATCH] src/calls-call-window.c: Inhibit suspend during active call |
697 |
- |
698 |
---- |
699 |
- src/calls-call-window.c | 26 ++++++++++++++++++++++++++ |
700 |
- 1 file changed, 26 insertions(+) |
701 |
- |
702 |
-diff --git a/src/calls-call-window.c b/src/calls-call-window.c |
703 |
-index 312a892..d6c5d8a 100644 |
704 |
---- a/src/calls-call-window.c |
705 |
-+++ b/src/calls-call-window.c |
706 |
-@@ -60,6 +60,8 @@ struct _CallsCallWindow |
707 |
- GtkStack *call_stack; |
708 |
- GtkFlowBox *call_selector; |
709 |
- |
710 |
-+ guint inhibit_cookie; |
711 |
-+ |
712 |
- #ifdef CALLS_WAYLAND |
713 |
- gboolean screensaver_active; |
714 |
- struct zwlr_layer_shell_v1 *layer_shell_iface; |
715 |
-@@ -164,6 +166,28 @@ update_layer_surface (CallsCallWindow *self, |
716 |
- #endif // CALLS_WAYLAND |
717 |
- |
718 |
- |
719 |
-+static void |
720 |
-+session_inhibit (CallsCallWindow *self, gboolean inhibit) |
721 |
-+{ |
722 |
-+ if (inhibit) |
723 |
-+ { |
724 |
-+ if (self->inhibit_cookie == 0) |
725 |
-+ self->inhibit_cookie = |
726 |
-+ gtk_application_inhibit (gtk_window_get_application (GTK_WINDOW (self)), |
727 |
-+ GTK_WINDOW (self), |
728 |
-+ GTK_APPLICATION_INHIBIT_SUSPEND, |
729 |
-+ "call active"); |
730 |
-+ } |
731 |
-+ else |
732 |
-+ { |
733 |
-+ gtk_application_uninhibit (gtk_window_get_application (GTK_WINDOW (self)), |
734 |
-+ self->inhibit_cookie); |
735 |
-+ self->inhibit_cookie = 0; |
736 |
-+ } |
737 |
-+ |
738 |
-+} |
739 |
-+ |
740 |
-+ |
741 |
- static void |
742 |
- update_visibility (CallsCallWindow *self) |
743 |
- { |
744 |
-@@ -184,6 +208,8 @@ update_visibility (CallsCallWindow *self) |
745 |
- { |
746 |
- gtk_stack_set_visible_child_name (self->main_stack, "active-call"); |
747 |
- } |
748 |
-+ |
749 |
-+ session_inhibit (self, !!calls); |
750 |
- } |
751 |
- |
752 |
- |
753 |
--- |
754 |
-2.26.2 |
755 |
- |
756 |
|
757 |
diff --git a/net-voip/gnome-calls/gnome-calls-0.3.4.ebuild b/net-voip/gnome-calls/gnome-calls-41.0.ebuild |
758 |
similarity index 89% |
759 |
rename from net-voip/gnome-calls/gnome-calls-0.3.4.ebuild |
760 |
rename to net-voip/gnome-calls/gnome-calls-41.0.ebuild |
761 |
index 24ccb3bcf..887ce8ac8 100644 |
762 |
--- a/net-voip/gnome-calls/gnome-calls-0.3.4.ebuild |
763 |
+++ b/net-voip/gnome-calls/gnome-calls-41.0.ebuild |
764 |
@@ -8,7 +8,7 @@ inherit vala meson gnome2-utils xdg |
765 |
|
766 |
DESCRIPTION="Phone dialer and call handler" |
767 |
HOMEPAGE="https://gitlab.gnome.org/GNOME/calls" |
768 |
-SRC_URI="https://gitlab.gnome.org/GNOME/calls/-/archive/v${PV}/calls-v${PV}.tar.gz" |
769 |
+SRC_URI="https://gitlab.gnome.org/GNOME/calls/-/archive/${PV}/calls-${PV}.tar.gz" |
770 |
|
771 |
LICENSE="GPL-3" |
772 |
SLOT="0" |
773 |
@@ -36,7 +36,7 @@ BDEPEND=" |
774 |
dev-util/wayland-scanner |
775 |
" |
776 |
|
777 |
-S="${WORKDIR}/$PN-${PV}" |
778 |
+S="${WORKDIR}/calls-${PV}" |
779 |
|
780 |
src_prepare() { |
781 |
default |