From b80b95e4583239bd8768c14188f1693b812d026c Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 17:09:01 +0100 Subject: .build.yml: Provide extra dependency list for debian:stable. --- .build.yml | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/.build.yml b/.build.yml index b2723ca..077c33e 100644 --- a/.build.yml +++ b/.build.yml @@ -44,6 +44,45 @@ requires: - intltool - valac - libaccountsservice-dev +# - libayatana-common-dev + - libgmenuharness-dev + - gobject-introspection + - libgirepository1.0-dev + - liblomiri-url-dispatcher-dev + - libglib2.0-dev + - liblomiri-api-dev + - libpulse-dev + - libpulse-mainloop-glib0 + - libnotify-dev + - libgee-0.8-dev + - libxml2-dev + - pulseaudio + - qtbase5-dev + - qtbase5-dev-tools + - qtdeclarative5-dev + - qtdeclarative5-dev-tools + - systemd + - dbus-test-runner + - libgtest-dev + - libdbustest1-dev + - libqtdbusmock1-dev + - libqtdbustest1-dev + - python3-dbusmock + + debian:stable: + # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-sound + - clang + - clang-tools + - g++ + - cppcheck + - git + - cmake + - cmake-extras + - dbus + - gir1.2-accountsservice-1.0 + - intltool + - valac + - libaccountsservice-dev # - libayatana-common-dev # - libgmenuharness-dev - gobject-introspection -- cgit v1.2.3 From 984b5d508d491fd96db4c9aa1b109f95ae2c4b14 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 17:10:37 +0100 Subject: .build.yml: Build lomiri-api and/or gmenuharness from source, if needed. Fixes https://github.com/AyatanaIndicators/ayatana-indicator-sound/issues/59 --- .build.yml | 43 +++++++++++++++++++++++++++++++++---------- 1 file changed, 33 insertions(+), 10 deletions(-) diff --git a/.build.yml b/.build.yml index 077c33e..d08797a 100644 --- a/.build.yml +++ b/.build.yml @@ -122,7 +122,7 @@ requires: - valac - libaccountsservice-dev # - libayatana-common-dev -# - libgmenuharness-dev + - libgmenuharness-dev - gobject-introspection - libgirepository1.0-dev - liblomiri-url-dispatcher-dev @@ -165,6 +165,7 @@ requires: - libgirepository1.0-dev # - liblomiri-url-dispatcher-dev - libglib2.0-dev +# - liblomiri-api-dev - libpulse-dev - libpulse-mainloop-glib0 - libnotify-dev @@ -212,16 +213,38 @@ before_scripts: - make install - cd - - rm -Rf libayatana-common-build/ - - cd ${START_DIR} - - if [ ! -d gmenuharness-build ]; then - - git clone --depth 1 https://gitlab.com/ubports/core/gmenuharness.git gmenuharness-build + - + - # Ubuntu focal needs lomiri-api, all others have it + - if [ ${DISTRO_NAME} == "ubuntu" ] && [ ${DISTRO_VERSION} == "focal" ]; then + - cd ${START_DIR} + - if [ ! -d lomiri-api-build ]; then + - git clone --depth 1 https://gitlab.com/ubports/core/lomiri-api.git lomiri-api-build + - fi + - cd lomiri-api-build + - mkdir build/ + - cd build/ + - cmake .. -DCMAKE_INSTALL_PREFIX=/usr + - make + - make install + - cd - + - rm -Rf lomiri-api-build/ + - fi + - + - # Debian bookworm (testing) and Ubuntu jammy have lomiri-api and gmenuharness by default + - # Debian bullseye (stable) has lomiri-api, but needs gmenuharness + - if ([ ${DISTRO_NAME} == "debian" ] && [ ${DISTRO_VERSION} == "stable" ]) || + - ([ ${DISTRO_NAME} == "ubuntu" ] && [ ${DISTRO_VERSION} == "focal" ]); then + - cd ${START_DIR} + - if [ ! -d gmenuharness-build ]; then + - git clone --depth 1 https://gitlab.com/ubports/core/gmenuharness.git gmenuharness-build + - fi + - cd gmenuharness-build + - cmake . -DCMAKE_INSTALL_PREFIX=/usr + - make + - make install + - cd - + - rm -Rf gmenuharness-build/ - fi - - cd gmenuharness-build - - cmake . -DCMAKE_INSTALL_PREFIX=/usr - - make - - make install - - cd - - - rm -Rf gmenuharness-build/ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then -- cgit v1.2.3 From ace8185f93ee9f160d2509a71b5b852646ad741e Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 17:22:17 +0100 Subject: .build.yml: Adjust for gmenuharness not yet being in Debian testing. This commit can simply be reverted once gmenuharness has landed in Debian testing (bookworm). --- .build.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.build.yml b/.build.yml index d08797a..69181d5 100644 --- a/.build.yml +++ b/.build.yml @@ -45,7 +45,7 @@ requires: - valac - libaccountsservice-dev # - libayatana-common-dev - - libgmenuharness-dev +# - libgmenuharness-dev - gobject-introspection - libgirepository1.0-dev - liblomiri-url-dispatcher-dev @@ -230,9 +230,9 @@ before_scripts: - rm -Rf lomiri-api-build/ - fi - - - # Debian bookworm (testing) and Ubuntu jammy have lomiri-api and gmenuharness by default - - # Debian bullseye (stable) has lomiri-api, but needs gmenuharness - - if ([ ${DISTRO_NAME} == "debian" ] && [ ${DISTRO_VERSION} == "stable" ]) || + - # Debian unstable and Ubuntu jammy have lomiri-api and gmenuharness by default + - # Debian bullseye (stable) and bookworm (testing) have lomiri-api, but need gmenuharness + - if ([ ${DISTRO_NAME} == "debian" ]) || - ([ ${DISTRO_NAME} == "ubuntu" ] && [ ${DISTRO_VERSION} == "focal" ]); then - cd ${START_DIR} - if [ ! -d gmenuharness-build ]; then -- cgit v1.2.3 From bd8125c32d9728c99e5129f630e082cbdf536247 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Mon, 8 Nov 2021 12:43:49 +0100 Subject: src/CMakeLists.txt: Fix use of HAS_LOMIRI_ACCTSERVICE_*_SETTINGS and what happens if defined as ON. --- src/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ef740f6..f74e488 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -219,13 +219,13 @@ vala_add(ayatana-indicator-sound-service if(${HAS_LOMIRI_ACCTSERVICE_PRIVACY_SETTINGS}) vala_add(ayatana-indicator-sound-service - accounts-service-system-sound-settings.vala + accounts-service-privacy-settings.vala ) endif() if(${HAS_LOMIRI_ACCTSERVICE_SYSTEMSOUND_SETTINGS}) vala_add(ayatana-indicator-sound-service - accounts-service-privacy-settings.vala + accounts-service-system-sound-settings.vala ) endif() -- cgit v1.2.3