[geany/infrastructure] c669ee: Merge pull request #12 from geany/builder_windows_update_base_image - Commits

1 Jan 2025


      Branch:      refs/heads/master
Author:      Enrico Tröger enrico.troeger@uvena.de
Committer:   GitHub noreply@github.com
Date:        Wed, 01 Jan 2025 12:22:50 UTC
Commit:      c669eebff910d0fed2a6550923b53b3621fe17bb
             https://github.com/geany/infrastructure/commit/c669eebff910d0fed2a6550923b53...
Log Message:
-----------
Merge pull request #12 from geany/builder_windows_update_base_image
Builders: Update base image to Debian Trixie
Modified Paths:
--------------
    builders/Dockerfile.mingw64
    builders/mingw64/bin/mingw-w64-i686-wine
    builders/mingw64/bin/mingw-w64-x86_64-wine
Modified: builders/Dockerfile.mingw64
4 lines changed, 2 insertions(+), 2 deletions(-)
===================================================================
@@ -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 \
Modified: builders/mingw64/bin/mingw-w64-i686-wine
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
 #!/bin/sh -e
-WINEPATH="${WINEPATH};/windows/mingw32/bin" wine $@
+WINEPATH="${WINEPATH};/windows/mingw32/bin" /usr/lib/wine/wine $@
Modified: builders/mingw64/bin/mingw-w64-x86_64-wine
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,3 +1,3 @@
 #!/bin/sh -e
-WINEPATH="${WINEPATH};/windows/mingw64/bin" wine64 $@
+WINEPATH="${WINEPATH};/windows/mingw64/bin" /usr/lib/wine/wine64 $@
--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

    