Skip to content

Update to msys2-hackes-23; suppress gecko/mono; strip binaries after removing include directory #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lazka merged 3 commits into from
May 14, 2026
Merged

Update to msys2-hackes-23; suppress gecko/mono; strip binaries after removing include directory #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e5e173
build-base: strip binaries after removing include directory
jhol May 13, 2026
bb34cb7
Suppress Gecko/Mono install prompts via WINEDLLOVERRIDES
jhol May 13, 2026
b615ff3
Update to msys2-hacks-23
jhol May 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build-base/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,12 @@ RUN apt update && \
# Build and install patched WINE (see https://github.com/msys2/MSYS2-packages/issues/682)
RUN git clone --filter=tree:0 https://gitlab.winehq.org/jhol/wine.git /tmp/winesrc && \
cd /tmp/winesrc && \
# https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-22
git checkout 2aa524aec434517843ffa1d52ad1982f86fdd074 && \
# https://gitlab.winehq.org/jhol/wine/-/commits/msys2-hacks-23
git checkout 5c414526d58855b42478ed7ad7faf6654f646b04 && \
./configure --disable-tests --enable-win64 --with-mingw --enable-archs=x86_64,i386 && \
make -j $(nproc) && \
env DESTDIR=/wine make -j $(nproc) install && \
rm -rf /tmp/winesrc && \
# Clean things up
find /wine -type f -exec strip --strip-all {} \; && \
rm -Rf /wine/usr/local/include
rm -Rf /wine/usr/local/include && \
find /wine -type f -exec strip --strip-all {} \;
2 changes: 2 additions & 0 deletions cygwin/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,9 @@ COPY --from=build /wine /
RUN ldconfig

# Avoid "tzset" startup warning + wineboot crashing
# Suppress Gecko/Mono install prompts (not needed in container)
ENV TZ=UTC
ENV WINEDLLOVERRIDES="mshtml=d;mscoree=d"

# Initialize Wine
RUN WINEDEBUG=-all wineboot --init && wineserver --wait
Expand Down
2 changes: 1 addition & 1 deletion cygwin/cygwin
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

WINEDEBUG="-all" WINEPATH="C:\\cygwin64\\bin" xvfb-run -a wine bash.exe -o igncr -l "$@"
WINEDEBUG="-all" WINEDLLOVERRIDES="${WINEDLLOVERRIDES:-mshtml=d;mscoree=d}" WINEPATH="C:\\cygwin64\\bin" xvfb-run -a wine bash.exe -o igncr -l "$@"
2 changes: 2 additions & 0 deletions msys2/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ COPY --from=build /wine /
RUN ldconfig

# Avoid "tzset" startup warning + and wineboot crashing
# Suppress Gecko/Mono install prompts (not needed in container)
ENV TZ=UTC
ENV WINEDLLOVERRIDES="mshtml=d;mscoree=d"

# XXX: otherwise things hang
RUN WINEDEBUG=-all wineboot --init && wineserver --wait
Expand Down
2 changes: 1 addition & 1 deletion msys2/msys2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#!/bin/bash

WINEDEBUG="-all" WINEPATH="C:\\msys64\\usr\\bin" MSYSTEM="${MSYSTEM:-UCRT64}" xvfb-run -a wine bash.exe -l "$@"
WINEDEBUG="-all" WINEDLLOVERRIDES="${WINEDLLOVERRIDES:-mshtml=d;mscoree=d}" WINEPATH="C:\\msys64\\usr\\bin" MSYSTEM="${MSYSTEM:-UCRT64}" xvfb-run -a wine bash.exe -l "$@"