From e71885a5095f57944bf1de2396971328beab79a9 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 21 Sep 2021 15:17:33 +0400 Subject: [PATCH 1/2] Get rid of GTK integration mentions in appmage action --- .github/workflows/appimage.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 8f27022b2..073c3e677 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -606,9 +606,6 @@ jobs: if [ -n "${{ matrix.defines }}" ]; then DEFINE="-D ${{ matrix.defines }}=ON" if [ "${{ matrix.defines }}" = "DESKTOP_APP_DISABLE_DBUS_INTEGRATION" ]; then - DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_GTK_INTEGRATION=ON -D DESKTOP_APP_DISABLE_WEBKITGTK=ON" - fi - if [ "${{ matrix.defines }}" = "DESKTOP_APP_DISABLE_GTK_INTEGRATION" ]; then DEFINE="$DEFINE -D DESKTOP_APP_DISABLE_WEBKITGTK=ON" fi echo Define from matrix: $DEFINE From 6a8d3bda48d0afa3bf3f71b05bdf955531dcc239 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Tue, 21 Sep 2021 15:17:51 +0400 Subject: [PATCH 2/2] Try to fix glibmm build --- .github/workflows/appimage.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/appimage.yml b/.github/workflows/appimage.yml index 073c3e677..4b221d4ba 100644 --- a/.github/workflows/appimage.yml +++ b/.github/workflows/appimage.yml @@ -444,7 +444,7 @@ jobs: git apply ../patches/glibmm.patch export ACLOCAL_PATH="/usr/local/share/aclocal" NOCONFIGURE=1 ./autogen.sh - ./configure --enable-maintainer-mode --disable-documentation + CXXFLAGS="-g -O2 -std=c++14" ./configure --enable-maintainer-mode --disable-documentation make -j$(nproc) make install ldconfig