Merge #1036

1036: Fix Wine install steps from WineHQ. r=Emilgardis a=Alexhuszagh



Co-authored-by: Alex Huszagh <[email protected]>

Author: bors[bot]

docker/wine.sh

@@ -14,9 +14,18 @@ main() {
     # add repository for latest wine version and install from source
     # hardcode version, since we might want to avoid a version later.
     wget -nc https://dl.winehq.org/wine-builds/winehq.key
-    mv winehq.key /usr/share/keyrings/winehq-archive.key
+
+    # workaround for wine server synchronization, see #1035
+    # we need to ensure the keys are now stored in `/etc/apt/keyrings`,
+    # which were previously stored in `/usr/share/keyrings`, and ensure
+    # our sources list searches for the right location.
+    mkdir -p /etc/apt/keyrings
+    mv winehq.key /etc/apt/keyrings/winehq-archive.key
+
     wget -nc https://dl.winehq.org/wine-builds/ubuntu/dists/focal/winehq-focal.sources
     mv winehq-focal.sources /etc/apt/sources.list.d/
+    sed -i s@/usr/share/keyrings/@/etc/apt/keyrings/@ /etc/apt/sources.list.d/winehq-focal.sources || true
+
     apt-get update
     apt install --no-install-recommends --assume-yes \
         "winehq-stable=7.0.0.0~focal-1"