aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcharles kerr <charlesk@canonical.com>2016-01-01 19:25:16 -0600
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2021-08-28 10:17:14 +0200
commitc7881a2d849191e1b6243da75ebf9140d29655cb (patch)
treec738ddc2d637b340ed660d1e4dd0cb706ee80276
parent9b631e9353d206ab5c8bb64317f584024ebe0f4a (diff)
downloadayatana-indicator-power-c7881a2d849191e1b6243da75ebf9140d29655cb.tar.gz
ayatana-indicator-power-c7881a2d849191e1b6243da75ebf9140d29655cb.tar.bz2
ayatana-indicator-power-c7881a2d849191e1b6243da75ebf9140d29655cb.zip
create a data/sounds/ directory in the repo to hold Low battery.ogg
We may be adding sounds for when we transition to battery charging/discharging, so set up a sounds/ directory now.
-rw-r--r--.build.yml5
-rw-r--r--data/CMakeLists.txt8
-rw-r--r--data/sounds/Low battery.ogg (renamed from data/Low battery.ogg)bin71140 -> 71140 bytes
-rw-r--r--tests/CMakeLists.txt9
4 files changed, 11 insertions, 11 deletions
diff --git a/.build.yml b/.build.yml
index 90c2e9a..14f553b 100644
--- a/.build.yml
+++ b/.build.yml
@@ -17,6 +17,7 @@ requires:
- glib2
- libnotify
- systemd
+ - gstreamer
debian:
# Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-power
@@ -38,6 +39,7 @@ requires:
- dbus-test-runner
- libdbustest1-dev
- systemd
+ - libgstreamer1.0-dev
debian:stable:
- autopoint
@@ -57,6 +59,7 @@ requires:
- dbus-test-runner
- libdbustest1-dev
- systemd
+ - libgstreamer1.0-dev
ubuntu:
- autopoint
@@ -76,6 +79,7 @@ requires:
- dbus-test-runner
- libdbustest1-dev
- systemd
+ - libgstreamer1.0-dev
ubuntu:focal:
- autopoint
@@ -94,6 +98,7 @@ requires:
- dbus-test-runner
- libdbustest1-dev
- systemd
+ - libgstreamer1.0-dev
variables:
- 'CHECKERS="
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt
index d6ffb35..2b8ab36 100644
--- a/data/CMakeLists.txt
+++ b/data/CMakeLists.txt
@@ -74,8 +74,6 @@ install (FILES "${AYATANA_INDICATOR_FILE}"
##
# where to install
-set (SOUNDS_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}/sounds")
-message (STATUS "${SOUNDS_DIR} is the Sound install dir")
-
-install (FILES "Low battery.ogg"
- DESTINATION "${SOUNDS_DIR}")
+set (DATA_HOME "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CMAKE_PROJECT_NAME}")
+message (STATUS "${DATA_HOME} is the sounds/ install dir")
+install (DIRECTORY sounds DESTINATION ${DATA_HOME})
diff --git a/data/Low battery.ogg b/data/sounds/Low battery.ogg
index f6f9fb6..f6f9fb6 100644
--- a/data/Low battery.ogg
+++ b/data/sounds/Low battery.ogg
Binary files differ
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 96cabb2..566132e 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -14,13 +14,10 @@ set_directory_properties (PROPERTIES
ADDITIONAL_MAKE_CLEAN_FILES gschemas.compiled)
set_source_files_properties (gschemas.compiled GENERATED)
-# make a local install of the sounds
-set(XDG_DATA_HOME "${CMAKE_CURRENT_BINARY_DIR}/share")
+# make a XDG_DATA_HOME for sounds/
+set(XDG_DATA_HOME "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_DATADIR}")
add_definitions(-DXDG_DATA_HOME="${XDG_DATA_HOME}")
-file(COPY
- DIRECTORY "${CMAKE_SOURCE_DIR}/data/"
- DESTINATION "${XDG_DATA_HOME}/${CMAKE_PROJECT_NAME}/sounds"
- FILES_MATCHING PATTERN "*.ogg")
+file(COPY "${CMAKE_SOURCE_DIR}/data/sounds" DESTINATION "${XDG_DATA_HOME}/${CMAKE_PROJECT_NAME}")
# GSettings:
# compile the ayatana-indicator-power schema into a gschemas.compiled file in this directory,