From fbb2ec85efbf98fbb81a1cc4e6a39b8eab06a66a Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 16 Oct 2021 16:44:44 +0200 Subject: [PATCH] Install 32-bit version of xvfb in 32-bit wxMSW cross-build libgl1:i386 conflicts with 64-bit version of xvfb in the latest Sid, so try using 32-bit version of the latter. --- .github/workflows/ci_msw_cross.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci_msw_cross.yml b/.github/workflows/ci_msw_cross.yml index 0edc18c01e..4924a8b826 100644 --- a/.github/workflows/ci_msw_cross.yml +++ b/.github/workflows/ci_msw_cross.yml @@ -93,18 +93,18 @@ jobs: - name: Install prerequisites run: | - packages="git make wine x11-xserver-utils xvfb" + packages="git make wine x11-xserver-utils" case "${HOST_TRIPLET}" in x86_64-w64-mingw32) - packages="$packages g++-mingw-w64-x86-64 wine64" + packages="$packages g++-mingw-w64-x86-64 wine64 xvfb" winerun=wine64 ;; i686-w64-mingw32) sudo dpkg --add-architecture i386 sudo apt-get -q -o=Dpkg::Use-Pty=0 update - packages="$packages g++-mingw-w64-i686 wine32 libgl1:i386" + packages="$packages g++-mingw-w64-i686 wine32 libgl1:i386 xvfb:i386" winerun=wine ;;