From c8b0ce51732627cd90aaa8ccbcbc3d3fa13c2275 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 24 Oct 2021 20:34:24 +0200 Subject: bindings/mono/CMakeLists.txt: Fix missing target bindings/mono/AyatanaAppIndicator/ApplicationIndicator.cs. Resolves this FTBFS in bindings/mono/ for FLAVOUR_GTK3: make[2]: *** No rule to make target 'bindings/mono/AyatanaAppIndicator/ApplicationIndicator.cs', needed by 'bindings/mono/ayatana-appindicator3-sharp.dll'. Stop. --- bindings/mono/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bindings/mono/CMakeLists.txt b/bindings/mono/CMakeLists.txt index 6fada54..693097a 100644 --- a/bindings/mono/CMakeLists.txt +++ b/bindings/mono/CMakeLists.txt @@ -118,7 +118,7 @@ if (FLAVOUR_GTK3) OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaAppIndicator/NewStatusHandler.cs" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaAppIndicator/AppIndicatorStatus.cs" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaAppIndicator/NewIconHandler.cs" - OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaAppIndicator/ApplicationIndicator.cs.raw" + OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaAppIndicator/ApplicationIndicator.cs" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaAppIndicator/NewIconThemePathHandler.cs" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaAppIndicator/ScrollEventHandler.cs" OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/AyatanaAppIndicator/ConnectionChangedHandler.cs" -- cgit v1.2.3 From 074fb94f3b2c395a9f998186933fe1e7234d2d98 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 24 Oct 2021 20:45:35 +0200 Subject: .build.yml and debian/control: Sync list and order of build-dependencies (Debian and Ubuntu). --- .build.yml | 13 +++++++------ debian/control | 3 ++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.build.yml b/.build.yml index 072f9df..3909eaf 100644 --- a/.build.yml +++ b/.build.yml @@ -27,9 +27,9 @@ requires: - g++ - cppcheck - git + - at-spi2-core - cmake - cmake-extras - - mate-common - cli-common-dev - gobject-introspection - intltool @@ -43,10 +43,10 @@ requires: - libglib2.0-dev - libgtk-3-dev - libgtk2.0-dev + - gtk-sharp3-gapi + - libgtk3.0-cil-dev - gtk-sharp2-gapi - libgtk2.0-cil-dev - - libgtk3.0-cil-dev - - gtk-sharp3-gapi - libdbus-1-dev - libdbus-glib-1-dev - libdbusmenu-glib-dev @@ -59,10 +59,11 @@ requires: - clang - clang-tools - g++ + - cppcheck - git + - at-spi2-core - cmake - cmake-extras - - mate-common - cli-common-dev - gobject-introspection - intltool @@ -76,10 +77,10 @@ requires: - libglib2.0-dev - libgtk-3-dev - libgtk2.0-dev + - gtk-sharp3-gapi + - libgtk3.0-cil-dev - gtk-sharp2-gapi - libgtk2.0-cil-dev - - libgtk3.0-cil-dev - - gtk-sharp3-gapi - libdbus-1-dev - libdbus-glib-1-dev - libdbusmenu-glib-dev diff --git a/debian/control b/debian/control index 2124a4d..cd59fad 100644 --- a/debian/control +++ b/debian/control @@ -27,12 +27,13 @@ Build-Depends: debhelper (>= 9), libgtk3.0-cil-dev [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64], gtk-sharp2-gapi [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64], libgtk2.0-cil-dev [amd64 arm64 armel armhf i386 mipsel ppc64el s390x kfreebsd-amd64 kfreebsd-i386 powerpc ppc64], + libdbus-1-dev, libdbus-glib-1-dev (>= 0.82), libayatana-indicator-dev (>= 0.6.0-0~), libayatana-indicator3-dev (>= 0.6.0-0~), libdbusmenu-glib-dev (>= 0.5.90), - libdbusmenu-gtk-dev (>= 0.5.90), libdbusmenu-gtk3-dev (>= 0.5.90), + libdbusmenu-gtk-dev (>= 0.5.90), libgirepository1.0-dev, Standards-Version: 4.5.0 Homepage: https://github.com/AyatanaIndicators/libayatana-appindicator -- cgit v1.2.3 From 3a6def59f9b9862a9bbb1be4e234d33be778cbbf Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 24 Oct 2021 20:47:53 +0200 Subject: .build.yml: Fix rebuild with gcc on multi-core build nodes. --- .build.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.build.yml b/.build.yml index 3909eaf..4bbb5e2 100644 --- a/.build.yml +++ b/.build.yml @@ -172,7 +172,12 @@ build_scripts: - make clean - cd - - fi + - cd build/gtk3/ - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT + - cd - + - cd build/gtk2/ + - scan-build $CHECKERS --keep-cc -o html-report make -j $CPU_COUNT + - cd - - else - if [ ${DISTRO_NAME} == "debian" ];then - cd build/gtk3/ -- cgit v1.2.3 From d34e8050d84cc3c4347fc7bc8f6a3d72a0ef0d46 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 24 Oct 2021 20:58:33 +0200 Subject: .build.yml: Drop local builds of ayatana-ido and libayatana-indicator. They confuse cppcheck. --- .build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.build.yml b/.build.yml index 4bbb5e2..d95d18b 100644 --- a/.build.yml +++ b/.build.yml @@ -115,6 +115,8 @@ before_scripts: - cmake . -DCMAKE_INSTALL_PREFIX=/usr - make - make install + - cd ../ + - rm -Rf ayatana-ido-build/ - - cd ${START_DIR} - if [ ! -d libayatana-indicator-build ]; then @@ -133,6 +135,8 @@ before_scripts: - make - make install - cd - + - cd ../ + - rm -Rf libayatana-indicator-build/ build_scripts: - if [ ${DISTRO_NAME} == "debian" ];then -- cgit v1.2.3 From 52bade66cf86f70cb2be5f8c785f47b9c7f10192 Mon Sep 17 00:00:00 2001 From: Mike Gabriel Date: Sun, 24 Oct 2021 21:04:18 +0200 Subject: .build.yml: Fix building and running unit tests (mixed up of && and ||). --- .build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.build.yml b/.build.yml index d95d18b..d7cc048 100644 --- a/.build.yml +++ b/.build.yml @@ -147,7 +147,7 @@ build_scripts: - if [ -e ./CMakeLists.txt ]; then - mkdir -p build/gtk3/ - cd build/gtk3/ - - if [ ${DISTRO_NAME} == "debian" ] && [ ${DISTRO_NAME} == "ubuntu" ]; then + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - scan-build $CHECKERS cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DFLAVOUR_GTK3=ON - else - scan-build $CHECKERS cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DFLAVOUR_GTK3=ON @@ -155,7 +155,7 @@ build_scripts: - cd - - mkdir -p build/gtk2/ - cd build/gtk2/ - - if [ ${DISTRO_NAME} == "debian" ] && [ ${DISTRO_NAME} == "ubuntu" ]; then + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - scan-build $CHECKERS cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_TESTS=ON -DFLAVOUR_GTK2=ON - else - scan-build $CHECKERS cmake ../../ -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DFLAVOUR_GTK2=ON @@ -204,7 +204,7 @@ build_scripts: after_scripts: - if [ ${BUILD_TYPE} == "scripts" ];then - XVFB_RUN="$(which xvfb-run || true)" - - if [ ${DISTRO_NAME} == "debian" ] && [ ${DISTRO_NAME} == "ubuntu" ]; then + - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - if [ -e ./CMakeLists.txt ]; then - cd build/gtk3/ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test -- cgit v1.2.3