[gnome-contacts/wip/nielsdg/default-telepathy] Don't build telepathy by default.
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-contacts/wip/nielsdg/default-telepathy] Don't build telepathy by default.
- Date: Sun, 16 Sep 2018 18:57:56 +0000 (UTC)
commit 796eaaa5595642908d847397c88880ea1e9da1a6
Author: Niels De Graef <nielsdegraef gmail com>
Date: Sun Sep 16 20:46:08 2018 +0200
Don't build telepathy by default.
Fixes #103
data/flatpak/org.gnome.Contacts.json | 17 +----------------
meson_options.txt | 2 +-
2 files changed, 2 insertions(+), 17 deletions(-)
---
diff --git a/data/flatpak/org.gnome.Contacts.json b/data/flatpak/org.gnome.Contacts.json
index d799257..7f64a18 100644
--- a/data/flatpak/org.gnome.Contacts.json
+++ b/data/flatpak/org.gnome.Contacts.json
@@ -22,8 +22,6 @@
"--talk-name=org.gnome.evolution.dataserver.AddressBook9",
"--talk-name=org.gnome.evolution.dataserver.Sources5",
"--talk-name=org.gnome.evolution.dataserver.Subprocess.Backend.*",
- /* Telepathy */
- "--talk-name=org.freedesktop.Telepathy.AccountManager",
/* Access for the default avatars */
"--filesystem=xdg-data/pixmaps/faces:ro:create",
/* Needed for dconf to work */
@@ -47,20 +45,6 @@
"*.la", "*.a"
],
"modules": [
- {
- "name": "telepathy-glib",
- "config-opts": [
- "--disable-static",
- "--enable-vala-bindings=yes"
- ],
- "sources": [
- {
- "type": "archive",
- "url":
"https://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.24.1.tar.gz",
- "sha256": "9e0df1d8f857e0270cf0b32e2d1ca5a24aa7282873361785d573f72ad7f7d5eb"
- }
- ]
- },
{
"name": "libgee",
"make-install-args": [
@@ -179,6 +163,7 @@
"/share/GConf"
],
"config-opts": [
+ "--disable-telepathy-backend",
"--disable-fatal-warnings"
],
"sources": [
diff --git a/meson_options.txt b/meson_options.txt
index bd993df..2d967a6 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,4 +1,4 @@
option('cheese', type: 'boolean', value: true, description: 'Enable cheese webcam support.')
-option('telepathy', type: 'boolean', value: true, description: 'Enable Telepathy call/chat support.')
+option('telepathy', type: 'boolean', value: false, description: 'Enable Telepathy call/chat support.')
option('manpage', type: 'boolean', value: true, description: 'Enable building man pages.')
option('docs', type: 'boolean', value: false, description: 'Whether to build the valadoc docs.')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]