1 files changed, 33 insertions, 17 deletions
diff --git a/.build.yml b/.build.yml
index 172b2d2a..58ffc4ad 100644
--- a/.build.yml
+++ b/.build.yml
@@ -9,6 +9,7 @@ requires:
 - gcc
 - git
 - gobject-introspection
+ - gtk-layer-shell
 - itstool
 - libcanberra
 - libmateweather
@@ -21,6 +22,9 @@ requires:
 - meson
 - which
 - yelp-tools
+ # mate-desktop dependencies
+ - iso-codes
+ - gobject-introspection
 
 debian:
 # Useful URL: https://github.com/mate-desktop/debian-packages
@@ -40,6 +44,7 @@ requires:
 - libgirepository1.0-dev
 - libglib2.0-dev
 - libgtk-3-dev
+ - libgtk-layer-shell-dev
 - libice-dev
 - libmate-desktop-dev
 - libmate-menu-dev
@@ -55,6 +60,10 @@ requires:
 - mate-common
 - meson
 - yelp-tools
+ # mate-desktop dependencies
+ - iso-codes
+ - gobject-introspection
+ - libgirepository1.0-dev
 
 fedora:
 # Useful URL: https://src.fedoraproject.org/cgit/rpms/mate-panel.git
@@ -67,8 +76,8 @@ requires:
 - git
 - gobject-introspection-devel
 - gtk3-devel
+ - gtk-layer-shell-devel
 - libSM-devel
- - libcanberra-devel
 - libmateweather-devel
 - libwnck3-devel
 - make
@@ -78,6 +87,9 @@ requires:
 - meson
 - redhat-rpm-config
 - yelp-tools
+ # mate-desktop dependencies
+ - iso-codes-devel
+ - gobject-introspection-devel
 
 ubuntu:
 - autoconf-archive
@@ -94,6 +106,7 @@ requires:
 - libgirepository1.0-dev
 - libglib2.0-dev
 - libgtk-3-dev
+ - libgtk-layer-shell-dev
 - libice-dev
 - libmate-desktop-dev
 - libmate-menu-dev
@@ -109,6 +122,10 @@ requires:
 - mate-common
 - meson
 - yelp-tools
+ # mate-desktop dependencies
+ - iso-codes
+ - gobject-introspection
+ - libgirepository1.0-dev
 
 variables:
 - 'CHECKERS="
@@ -127,37 +144,36 @@ variables:
 -enable-checker alpha.unix.cstring.OutOfBounds
 -enable-checker alpha.core.FixedAddr
 -enable-checker security.insecureAPI.strcpy"'
+ - MATE_DESKTOP_VERSION=1.28.2
 
 before_scripts:
+
+build_scripts:
 - cd ${START_DIR}
- - '[ -f mate-common-1.24.1.tar.xz ] || curl -Ls -o mate-common-1.24.1.tar.xz https://github.com/mate-desktop/mate-common/releases/download/v1.24.1/mate-common-1.24.1.tar.xz'
- - tar xf mate-common-1.24.1.tar.xz
- - cd mate-common-1.24.1
+ - if [ ! -f mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz ];then
+ - curl -Ls -o mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz https://github.com/mate-desktop/mate-desktop/releases/download/v${MATE_DESKTOP_VERSION}/mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz
+ - fi
+ - tar xf mate-desktop-${MATE_DESKTOP_VERSION}.tar.xz
+ - cd mate-desktop-${MATE_DESKTOP_VERSION}
 - if [ ${DISTRO_NAME} == "debian" -o ${DISTRO_NAME} == "ubuntu" ];then
- - ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu
+ - ./autogen.sh --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu --libexecdir=/usr/lib/x86_64-linux-gnu
 - else
- - ./configure --prefix=/usr
+ - ./autogen.sh --prefix=/usr
+ - fi
+ - if [ ${TRAVIS} == "false" ]; then
+ - make clean
 - fi
 - make
 - make install
 
 - cd ${START_DIR}
- - if [ ! -d gtk-layer-shell-build ]; then
- - git clone --depth 1 https://github.com/wmww/gtk-layer-shell.git gtk-layer-shell-build
- - fi
- - cd gtk-layer-shell-build
- - meson _build --prefix /usr
- - ninja -C _build
- - ninja -C _build install
-
-build_scripts:
 - if [ ${DISTRO_NAME} == "debian" ];then
- - export CFLAGS+=" -Wsign-compare -Wunused-parameter"
+ - export CFLAGS+=" -Wsign-compare"
 - cppcheck --enable=warning,style,performance,portability,information,missingInclude -i'gtk-layer-shell-build' .
 - fi
 
 - NOCONFIGURE=1 ./autogen.sh
- - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum
+ - scan-build $CHECKERS ./configure --enable-compile-warnings=maximum --with-in-process-applets=all
 - if [ $CPU_COUNT -gt 1 ]; then
 - if [ ${DISTRO_NAME} == "debian" ];then
 - scan-build $CHECKERS --keep-cc --use-cc=clang --use-c++=clang++ -o html-report make -j $CPU_COUNT