From d27ad8e23a721e0005ef7b1405bec8bbbedf19d5 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 25 Oct 2023 12:14:01 +1000 Subject: [PATCH] CI/AppImage: Enable DBus for dependencies --- .github/workflows/scripts/linux/build-dependencies-qt.sh | 4 ++-- .github/workflows/scripts/linux/install-packages-qt.sh | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scripts/linux/build-dependencies-qt.sh b/.github/workflows/scripts/linux/build-dependencies-qt.sh index 5248fd2985eb2..87ec5bfabf705 100755 --- a/.github/workflows/scripts/linux/build-dependencies-qt.sh +++ b/.github/workflows/scripts/linux/build-dependencies-qt.sh @@ -37,7 +37,7 @@ shasum -a 256 --check SHASUMS echo "Building SDL..." tar xf "$SDL.tar.gz" cd "$SDL" -./configure --prefix "$INSTALLDIR" --disable-dbus --without-x --disable-video-opengl --disable-video-opengles --disable-video-vulkan --disable-wayland-shared --disable-ime --disable-oss --disable-alsa --disable-jack --disable-esd --disable-pipewire --disable-pulseaudio --disable-arts --disable-nas --disable-sndio --disable-fusionsound --disable-diskaudio +./configure --prefix "$INSTALLDIR" --enable-dbus --without-x --disable-video-opengl --disable-video-opengles --disable-video-vulkan --disable-wayland-shared --disable-ime --disable-oss --disable-alsa --disable-jack --disable-esd --disable-pipewire --disable-pulseaudio --disable-arts --disable-nas --disable-sndio --disable-fusionsound --disable-diskaudio make "-j$NPROCS" make install cd .. @@ -60,7 +60,7 @@ tar xf "qtbase-everywhere-src-$QT.tar.xz" cd "qtbase-everywhere-src-$QT" mkdir build cd build -../configure -prefix "$INSTALLDIR" -release -no-dbus -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -- -DFEATURE_dbus=OFF -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF +../configure -prefix "$INSTALLDIR" -release -dbus-linked -gui -widgets -fontconfig -qt-doubleconversion -ssl -openssl-runtime -opengl desktop -qpa xcb,wayland -xkbcommon -- -DFEATURE_dbus=ON -DFEATURE_icu=OFF -DFEATURE_printsupport=OFF -DFEATURE_sql=OFF cmake --build . --parallel cmake --install . cd ../../ diff --git a/.github/workflows/scripts/linux/install-packages-qt.sh b/.github/workflows/scripts/linux/install-packages-qt.sh index 7f42396fbd79a..07ff755ce9692 100755 --- a/.github/workflows/scripts/linux/install-packages-qt.sh +++ b/.github/workflows/scripts/linux/install-packages-qt.sh @@ -41,6 +41,7 @@ declare -a PCSX2_PACKAGES=( "libasound2-dev" "libbz2-dev" "libcurl4-openssl-dev" + "libdbus-1-dev" "libegl1-mesa-dev" "libgl1-mesa-dev" "libgtk-3-dev"