From a4cb69d1b5435fa7c140e6da3735d4e486e6b2b6 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Fri, 19 Apr 2024 14:46:50 +0000
Subject: [PATCH] win build: update debian base (11->12), and wine

---
 contrib/build-wine/Dockerfile       | 18 ++++++++++--------
 contrib/build-wine/apt.sources.list |  4 ++--
 contrib/freeze_containers_distro.sh |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/contrib/build-wine/Dockerfile b/contrib/build-wine/Dockerfile
index cf002a0a8..7a7b88c33 100644
--- a/contrib/build-wine/Dockerfile
+++ b/contrib/build-wine/Dockerfile
@@ -1,4 +1,4 @@
-FROM debian:bullseye@sha256:43ef0c6c3585d5b406caa7a0f232ff5a19c1402aeb415f68bcd1cf9d10180af8
+FROM debian:bookworm@sha256:b37bc259c67238d814516548c17ad912f26c3eed48dd9bb54893eafec8739c89
 
 # need ca-certificates before using snapshot packages
 RUN apt update -qq > /dev/null && apt install -qq --yes --no-install-recommends \
@@ -36,7 +36,9 @@ RUN dpkg --add-architecture i386 && \
     apt-get autoremove -y && \
     apt-get clean
 
-RUN wget -nc https://dl.winehq.org/wine-builds/Release.key && \
+RUN DEBIAN_CODENAME=$(lsb_release --codename --short) && \
+    WINEVERSION="9.0.0.0~${DEBIAN_CODENAME}-1" && \
+    wget -nc https://dl.winehq.org/wine-builds/Release.key && \
         echo "c51bcb8cc4a12abfbd7c7660eaf90f49674d15e222c262f27e6c96429111b822 Release.key" | sha256sum -c - && \
         apt-key add Release.key && \
         rm Release.key && \
@@ -47,12 +49,12 @@ RUN wget -nc https://dl.winehq.org/wine-builds/Release.key && \
     apt-add-repository https://dl.winehq.org/wine-builds/debian/ && \
     apt-get update -q && \
     apt-get install -qy --allow-downgrades \
-        wine-stable-amd64:amd64=8.0.1~bullseye-1 \
-        wine-stable-i386:i386=8.0.1~bullseye-1 \
-        wine-stable:amd64=8.0.1~bullseye-1 \
-        winehq-stable:amd64=8.0.1~bullseye-1 \
-        libvkd3d1:amd64=1.3~bullseye-1 \
-        libvkd3d1:i386=1.3~bullseye-1 \
+        wine-stable-amd64:amd64=${WINEVERSION} \
+        wine-stable-i386:i386=${WINEVERSION} \
+        wine-stable:amd64=${WINEVERSION} \
+        winehq-stable:amd64=${WINEVERSION} \
+        libvkd3d1:amd64=1.3~${DEBIAN_CODENAME}-1 \
+        libvkd3d1:i386=1.3~${DEBIAN_CODENAME}-1 \
         && \
     rm -rf /var/lib/apt/lists/* && \
     apt-get autoremove -y && \
diff --git a/contrib/build-wine/apt.sources.list b/contrib/build-wine/apt.sources.list
index e8c300942..b2128cdec 100644
--- a/contrib/build-wine/apt.sources.list
+++ b/contrib/build-wine/apt.sources.list
@@ -1,2 +1,2 @@
-deb https://snapshot.debian.org/archive/debian/20230317T205011Z/ bullseye main
-deb-src https://snapshot.debian.org/archive/debian/20230317T205011Z/ bullseye main
\ No newline at end of file
+deb https://snapshot.debian.org/archive/debian/20240419T084725Z/ bookworm main
+deb-src https://snapshot.debian.org/archive/debian/20240419T084725Z/ bookworm main
\ No newline at end of file
diff --git a/contrib/freeze_containers_distro.sh b/contrib/freeze_containers_distro.sh
index 8095b2826..6958d1f96 100755
--- a/contrib/freeze_containers_distro.sh
+++ b/contrib/freeze_containers_distro.sh
@@ -6,7 +6,7 @@ set -e
 
 DEBIAN_SNAPSHOT_BASE="https://snapshot.debian.org/archive/debian/"
 DEBIAN_APPIMAGE_DISTRO="buster"  # should match build-linux/appimage Dockerfile base
-DEBIAN_WINE_DISTRO="bullseye"    # should match build-wine Dockerfile base
+DEBIAN_WINE_DISTRO="bookworm"    # should match build-wine Dockerfile base
 DEBIAN_ANDROID_DISTRO="bookworm" # should match android Dockerfile base
 
 contrib=$(dirname "$0")