Commit dda12922 authored by Evangelos Ribeiro Tzaras's avatar Evangelos Ribeiro Tzaras
Browse files

d/patches: Remove upstreamed patches

parent f602f1c8
Subject: Fix missing main category from desktop file
From: Evangelos Ribeiro Tzaras <devrtz-debian@fortysixandtwo.eu>
* data/sm.puri.Calls.desktop: Added Network main category
--- a/data/sm.puri.Calls-daemon.desktop.in
+++ b/data/sm.puri.Calls-daemon.desktop.in
@@ -12,5 +12,5 @@
StartupNotify=true
NoDisplay=true
Terminal=false
-Categories=GNOME;GTK;Telephony;
+Categories=Network;GNOME;GTK;Telephony;
X-GNOME-AutoRestart=true
--- a/data/sm.puri.Calls.desktop.in
+++ b/data/sm.puri.Calls.desktop.in
@@ -11,6 +11,6 @@
Type=Application
StartupNotify=true
Terminal=false
-Categories=GNOME;GTK;Telephony;
+Categories=Network;GNOME;GTK;Telephony;
MimeType=x-scheme-handler/tel
X-Purism-FormFactor=Workstation;Mobile;
Subject: Rename binary from 'calls' to 'gnome-calls'
From: Evangelos Ribeiro Tzaras <devrtz-debian@fortysixandtwo.eu>
* src/meson.build: Renamed executable
* data/sm.puri.Calls.desktop: Changed Exec and TryExec to reflect the new name
--- a/src/meson.build
+++ b/src/meson.build
@@ -120,7 +120,7 @@
)
executable (
- 'calls',
+ 'gnome-calls',
calls_sources, calls_enum_sources, calls_resources,
wl_proto_sources, wayland_sources, 'main.c',
dependencies : calls_deps,
--- a/data/sm.puri.Calls.desktop.in
+++ b/data/sm.puri.Calls.desktop.in
@@ -6,8 +6,8 @@
Keywords=Telephone;Call;Phone;Dial;Dialer;PSTN;
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=sm.puri.Calls
-TryExec=calls
-Exec=calls %u
+TryExec=gnome-calls
+Exec=gnome-calls %u
Type=Application
StartupNotify=true
Terminal=false
--- a/data/sm.puri.Calls-daemon.desktop.in
+++ b/data/sm.puri.Calls-daemon.desktop.in
@@ -6,8 +6,8 @@
Keywords=Telephone;Call;Phone;Dial;Dialer;PSTN;
# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=sm.puri.Calls
-TryExec=calls
-Exec=calls --daemon
+TryExec=gnome-calls
+Exec=gnome-calls --daemon
Type=Application
StartupNotify=true
NoDisplay=true
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -41,7 +41,7 @@
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'gi')),
'--extra-dir=@0@'.format(join_paths(glib_docpath, 'gtk3')),
],
- install_dir: 'calls',
+ install_dir: 'gnome-calls',
install: true)
endif
From eaed62151bd533a4021ba937a959464383ddc0cb Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@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@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
0000-fix-missing-main-category-from-desktop-file.patch
0001-rename-binary.patch
0002-callaudio-api.patch
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment