summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos Garnacho <carlosg@gnome.org>2019-01-08 17:19:21 +0100
committerFlorian Müllner <florian.muellner@gmail.com>2019-01-09 23:09:18 +0000
commit3989cad3db412224ab0bacfb5ee5d630fc9711f5 (patch)
tree348a552239cb7f019f53f779b734d2a6b806556f
parent2a1f915f9d4f5b1a1bbbada065d108ba82925b70 (diff)
downloadgnome-shell-3989cad3db412224ab0bacfb5ee5d630fc9711f5.tar.gz
build: Remove Canberra dependency
It is no longer direct, but rather through mutter API. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/327
-rw-r--r--meson.build2
-rw-r--r--src/meson.build1
-rwxr-xr-xtools/build/gnome-shell-build-setup.sh2
3 files changed, 0 insertions, 5 deletions
diff --git a/meson.build b/meson.build
index bb47235da..ff4aa90da 100644
--- a/meson.build
+++ b/meson.build
@@ -73,8 +73,6 @@ else
endif
atk_bridge_dep = dependency('atk-bridge-2.0')
-canberra_dep = dependency('libcanberra')
-canberra_gtk_dep = dependency('libcanberra-gtk3')
ecal_dep = dependency('libecal-1.2', version: ecal_req)
eds_dep = dependency('libedataserver-1.2', version: eds_req)
gcr_dep = dependency('gcr-base-3', version: gcr_req)
diff --git a/src/meson.build b/src/meson.build
index 4607581f5..b56ee357f 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -49,7 +49,6 @@ gnome_shell_deps = [
cogl_pango_dep,
startup_dep,
gi_dep,
- canberra_dep, canberra_gtk_dep,
polkit_dep,
gcr_dep,
libsystemd_dep
diff --git a/tools/build/gnome-shell-build-setup.sh b/tools/build/gnome-shell-build-setup.sh
index f75d44d9a..59637e4a5 100755
--- a/tools/build/gnome-shell-build-setup.sh
+++ b/tools/build/gnome-shell-build-setup.sh
@@ -104,7 +104,6 @@ libacl: f:libacl-devel d:libacl1-dev # gudev
libcurl: f:libcurl-devel # liboauth. See below for Debian
libffi: fs:libffi-devel d:libffi-dev # gobject-introspection
libsystemd-login: fs:systemd-devel # gnome-session gnome-settings-daemon polkit PackageKit
-libtool-ltdl: f:libtool-ltdl-devel d:libltdl-dev # libcanberra
libusb: f:libusb1-devel d:libusb-1.0-0-dev # upower
openssl: f:openssl-devel d:libssl-dev # liboauth
pam: f:pam-devel d:libpam-dev # polkit
@@ -115,7 +114,6 @@ sane: f:sane-backends-devel d:libsane-dev # colord
sqlite: d:libsqlite3-dev f:sqlite-devel # libsoup
udev: f:libudev-devel d:libudev-dev # gudev
uuid: f:libuuid-devel d:uuid-dev # Networkmanager
-vorbis: f:libvorbis-devel d:libvorbis-dev # libcanberra
wireless-tools: f:wireless-tools-devel d:libiw-dev s:libiw-devel # NetworkManager
# python libraries used by gnome-shell wrapper script