diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 4d7afcf87..a0448feff 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -31,7 +31,7 @@ jobs: - name: Install Dependencies run: | apt update - apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libcanberra-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libsqlite3-dev meson valac valadoc + apt install -y gettext gsettings-desktop-schemas-dev libatk-bridge2.0-dev libclutter-1.0-dev libgee-0.8-dev libglib2.0-dev libgnome-desktop-3-dev libgranite-dev libgtk-3-dev ${{ matrix.mutter_pkg }} libsqlite3-dev meson valac valadoc - name: Build env: DESTDIR: out @@ -50,7 +50,7 @@ jobs: - uses: actions/checkout@v5 - name: Install Dependencies run: | - dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-devel libcanberra-devel clutter-devel libgee-devel glib2-devel gnome-desktop3-devel granite-devel granite-7-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite-devel meson valac valadoc + dnf install -y desktop-file-utils gettext gsettings-desktop-schemas-devel atk-devel clutter-devel libgee-devel glib2-devel gnome-desktop3-devel granite-devel granite-7-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite-devel meson valac valadoc - name: Build env: DESTDIR: out @@ -69,7 +69,7 @@ jobs: run: | zypper addrepo https://download.opensuse.org/repositories/X11:Pantheon/15.6/X11:Pantheon.repo zypper --gpg-auto-import-keys refresh - zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 libcanberra-devel clutter-devel libgee-devel glib2-devel libgnome-desktop-3-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc + zypper --non-interactive install tar git desktop-file-utils gsettings-desktop-schemas-devel libatk-1_0-0 clutter-devel libgee-devel glib2-devel libgnome-desktop-3-devel granite6-devel granite-devel gtk3-devel gtk4-devel libhandy-devel mutter-devel sqlite3-devel meson vala valadoc gcc - uses: actions/checkout@v5 - name: Build env: diff --git a/README.md b/README.md index 25e859374..08240d7a3 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,6 @@ A window & compositing manager based on libmutter and designed by elementary for You'll need the following dependencies: * gettext (>= 0.19.6) * gsettings-desktop-schemas-dev -* libcanberra-dev * libclutter-1.0-dev (>= 1.12.0) * libgee-0.8-dev * libglib2.0-dev (>= 2.74) diff --git a/docs/meson.build b/docs/meson.build index 6636e38ac..56e46c864 100644 --- a/docs/meson.build +++ b/docs/meson.build @@ -20,7 +20,6 @@ basic_command = [ '--pkg', 'gio-unix-2.0', '--pkg', 'gmodule-2.0', '--pkg', 'posix', - '--pkg', 'libcanberra', '--pkg', 'sqlite3', '--pkg', 'libsystemd', '--pkg', 'granite', diff --git a/meson.build b/meson.build index d897df945..96ae7a72c 100644 --- a/meson.build +++ b/meson.build @@ -73,7 +73,6 @@ glib_version_required = '2.74.0' gtk_version_required = '3.10.0' atk_bridge_dep = dependency('atk-bridge-2.0') -canberra_dep = dependency('libcanberra') glib_dep = dependency('glib-2.0', version: '>= @0@'.format(glib_version_required)) gobject_dep = dependency('gobject-2.0', version: '>= @0@'.format(glib_version_required)) gio_dep = dependency('gio-2.0', version: '>= @0@'.format(glib_version_required)) @@ -169,7 +168,7 @@ endif add_project_arguments(vala_flags, language: 'vala') add_project_link_arguments(['-Wl,-rpath,@0@'.format(mutter_typelib_dir)], language: 'c') -gala_base_dep = [atk_bridge_dep, canberra_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep, config_dep] +gala_base_dep = [atk_bridge_dep, glib_dep, gobject_dep, gio_dep, gio_unix_dep, gmodule_dep, gee_dep, gtk_dep, mutter_dep, gnome_desktop_dep, m_dep, posix_dep, sqlite3_dep, xext_dep, config_dep] if get_option('systemd') gala_base_dep += systemd_dep diff --git a/src/ScreenshotManager.vala b/src/ScreenshotManager.vala index 72372bea6..315ba6cec 100644 --- a/src/ScreenshotManager.vala +++ b/src/ScreenshotManager.vala @@ -552,17 +552,7 @@ public class Gala.ScreenshotManager : Object { } private void play_shutter_sound () { - Canberra.Context context; - Canberra.Proplist props; - - Canberra.Context.create (out context); - Canberra.Proplist.create (out props); - - props.sets (Canberra.PROP_EVENT_ID, "screen-capture"); - props.sets (Canberra.PROP_EVENT_DESCRIPTION, _("Screenshot taken")); - props.sets (Canberra.PROP_CANBERRA_CACHE_CONTROL, "permanent"); - - context.play_full (0, props, null); + wm.get_display ().get_sound_player ().play_from_theme ("screen-capture", _("Screenshot taken")); } private Cairo.ImageSurface take_screenshot (int x, int y, int width, int height, bool include_cursor) {