From b14cee59ef97e0742e0fc2fee506ab6bc726bd5b Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Wed, 24 May 2023 21:06:29 +0200
Subject: [PATCH 1/2] CI: Save one call to "sudo apt-get update" in
 coverage.yml

---
 .github/workflows/coverage.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 8f3e6788..91372591 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -51,7 +51,10 @@ jobs:
         set -x -u
         source /etc/os-release
 
-        sudo apt-get update
+        # Unlock 32bit architecture (for Wine further down)
+        sudo dpkg --add-architecture i386  # for wine32
+        sudo apt-get update  # due to new architecture
+
         sudo apt-get install --yes --no-install-recommends -V \
             cmake \
             docbook2x \
@@ -64,8 +67,6 @@ jobs:
             moreutils
 
         # Install 32bit Wine
-        sudo dpkg --add-architecture i386  # for wine32
-        sudo apt-get update  # due to new architecture
         sudo apt-get install --yes --no-install-recommends -V \
             mingw-w64 \
             wine-stable \

From 6fa6a54aa3cc0e6146489bb143031af72a8e4883 Mon Sep 17 00:00:00 2001
From: Sebastian Pipping <sebastian@pipping.org>
Date: Wed, 24 May 2023 21:09:21 +0200
Subject: [PATCH 2/2] CI: Resolve conflicts with ppa:ubuntu-toolchain-r/test in
 coverage.yml

> + sudo apt-get install --yes --no-install-recommends -V mingw-w64 wine-stable wine32:i386
> Reading package lists...
> Building dependency tree...
> Reading state information...
> Some packages could not be installed. This may mean that you have
> requested an impossible situation or if you are using the unstable
> distribution that some required packages have not yet been created
> or been moved out of Incoming.
> The following information may help to resolve the situation:
>
> The following packages have unmet dependencies:
>  libc6:i386 : Depends: libgcc-s1:i386 but it is not going to be installed
>  libicu70:i386 : Depends: libgcc-s1:i386 (>= 7) but it is not going to be installed
>                  Depends: libstdc++6:i386 (>= 5.2) but it is not going to be installed
> E: Unable to correct problems, you have held broken packages.
---
 .github/workflows/coverage.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index 91372591..c626e7aa 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -64,9 +64,11 @@ jobs:
             lcov \
             libbsd-dev \
             lzip \
-            moreutils
+            moreutils \
+            ppa-purge
 
         # Install 32bit Wine
+        sudo ppa-purge -y ppa:ubuntu-toolchain-r/test  # to unblock
         sudo apt-get install --yes --no-install-recommends -V \
             mingw-w64 \
             wine-stable \