Merge pull request #12 from geany/builder_windows_update_base_image

Builders: Update base image to Debian Trixie
geany · Jan 1, 2025 · c669eeb · c669eeb
2 parents dd9f792 + b72326d
commit c669eeb
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/builders/Dockerfile.mingw64 b/builders/Dockerfile.mingw64
@@ -9,7 +9,7 @@
 # For more details, see build_mingw64_geany.sh where this image is used.
 #
 
-FROM debian:bullseye
+FROM debian:trixie
 
 # Find the latest version on https://packages.msys2.org/package/msys2-keyring
 ENV MSYS2_KEYRING_PKG="msys2-keyring-1~20230703-1-any.pkg.tar.zst"
@@ -33,7 +33,7 @@ RUN set -ex && \
     apt-get update && \
     apt-get install --no-install-recommends --assume-yes \
     # libraries \
-    libcurl3-gnutls libgpgme11 libarchive13 libssl1.1 \
+    libcurl3t64-gnutls libgpgme11t64 libarchive13t64 \
     # common useful utilities \
     wget curl less nano git gnupg2 file ca-certificates \
     zip unzip xz-utils zstd \

diff --git a/builders/mingw64/bin/mingw-w64-i686-wine b/builders/mingw64/bin/mingw-w64-i686-wine
@@ -1,4 +1,4 @@
 #!/bin/sh -e
 
-WINEPATH="${WINEPATH};/windows/mingw32/bin" wine $@
+WINEPATH="${WINEPATH};/windows/mingw32/bin" /usr/lib/wine/wine $@
 
diff --git a/builders/mingw64/bin/mingw-w64-x86_64-wine b/builders/mingw64/bin/mingw-w64-x86_64-wine
@@ -1,3 +1,3 @@
 #!/bin/sh -e
 
-WINEPATH="${WINEPATH};/windows/mingw64/bin" wine64 $@
+WINEPATH="${WINEPATH};/windows/mingw64/bin" /usr/lib/wine/wine64 $@