From f48b809bca917e600dab0389b19a341ed25546f3 Mon Sep 17 00:00:00 2001 From: Zdenek Zambersky Date: Tue, 12 May 2026 18:32:09 +0200 Subject: [PATCH] Backport 3eb7a82fef6a6e6554aa4e640bbf4226e716e582 --- .github/workflows/submit.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/submit.yml b/.github/workflows/submit.yml index c5f6e4fead..0745907c50 100644 --- a/.github/workflows/submit.yml +++ b/.github/workflows/submit.yml @@ -381,7 +381,7 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update sudo apt-get install --only-upgrade apt - sudo apt-get install openjdk-8-jdk gcc-9-multilib g++-9-multilib libfreetype6-dev:i386 libxrandr-dev:i386 libxtst-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libcups2-dev:i386 libasound2-dev:i386 + sudo apt-get install openjdk-8-jdk gcc-9-multilib g++-9-multilib libfreetype-dev:i386 libxrandr-dev:i386 libxtst-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libcups2-dev:i386 libasound2-dev:i386 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 --slave /usr/bin/g++ g++ /usr/bin/g++-9 if: matrix.multilib != '' @@ -406,7 +406,7 @@ jobs: sudo qemu-debootstrap --arch=${{ matrix.debian-arch }} --verbose - --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype6-dev,libpng-dev,libffi-dev + --include=fakeroot,symlinks,build-essential,libx11-dev,libxext-dev,libxrender-dev,libxrandr-dev,libxtst-dev,libxt-dev,libcups2-dev,libfontconfig1-dev,libasound2-dev,libfreetype-dev,libpng-dev,libffi-dev --resolve-deps bookworm ~/sysroot-${{ matrix.debian-arch }} @@ -520,7 +520,7 @@ jobs: sudo dpkg --add-architecture i386 sudo apt-get update sudo apt-get install --only-upgrade apt - sudo apt-get install openjdk-8-jdk gcc-9-multilib g++-9-multilib libfreetype6-dev:i386 libxrandr-dev:i386 libxtst-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libcups2-dev:i386 libasound2-dev:i386 + sudo apt-get install openjdk-8-jdk gcc-9-multilib g++-9-multilib libfreetype-dev:i386 libxrandr-dev:i386 libxtst-dev:i386 libtiff-dev:i386 libcupsimage2-dev:i386 libcups2-dev:i386 libasound2-dev:i386 sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-9 100 --slave /usr/bin/g++ g++ /usr/bin/g++-9 - name: Configure