From d42da41264e8e7a8939068791e9bb5038bdaf649 Mon Sep 17 00:00:00 2001 From: Robert Tari Date: Fri, 3 Sep 2021 22:16:59 +0200 Subject: .build.yml: Install libayatana-common dependency from GitHub --- .build.yml | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/.build.yml b/.build.yml index 4d8c04d9..7265d2cb 100644 --- a/.build.yml +++ b/.build.yml @@ -17,6 +17,7 @@ requires: - glib2 - libx11 - libxklavier +# - libayatana-common debian: # Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-ido @@ -34,6 +35,7 @@ requires: - libx11-dev - libxklavier-dev - systemd +# - libayatana-common-dev ubuntu: - autopoint @@ -49,6 +51,7 @@ requires: - libx11-dev - libxklavier-dev - systemd +# - libayatana-common-dev variables: - 'CHECKERS=" @@ -68,6 +71,16 @@ variables: -enable-checker alpha.core.FixedAddr -enable-checker security.insecureAPI.strcpy"' +before_scripts: + - cd ${START_DIR} + - if [ ! -d libayatana-common-build ]; then + - git clone --depth 1 https://github.com/AyatanaIndicators/libayatana-common.git libayatana-common-build + - fi + - cd libayatana-common-build + - cmake . -DCMAKE_INSTALL_PREFIX=/usr + - make + - make install + build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then - export CFLAGS+=" -Wsign-compare -Wunused-parameter" @@ -78,7 +91,7 @@ build_scripts: - NOCONFIGURE=1 ./autogen.sh - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum - elif [ -e ./CMakeLists.txt ]; then - - if [ ${DISTRO_NAME} == "debian" ];then + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON - else - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON @@ -104,7 +117,7 @@ build_scripts: #after_scripts: # - if [ ${BUILD_TYPE} == "scripts" ];then # - XVFB_RUN="$(which xvfb-run || true)" -# - if [ ${DISTRO_NAME} == "debian" ];then +# - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then # - if [ -e ./autogen.sh ]; then # - ${XVFB_RUN} make check # - elif [ -e ./CMakeLists.txt ]; then -- cgit v1.2.3