From 4da1928109f18aaccb659bce423ffbb82d2833e8 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Tue, 26 Dec 2023 13:33:01 +0100 Subject: [PATCH] [docker] wine is not required to build Windows version of elinks --- docker/win32-static/Dockerfile | 6 +++--- docker/win32-static/mes.sh | 1 + docker/win32-static/mes_js.sh | 1 + docker/win64-static/Dockerfile | 2 +- docker/win64-static/mes.sh | 1 + docker/win64-static/mes_js.sh | 1 + 6 files changed, 8 insertions(+), 4 deletions(-) diff --git a/docker/win32-static/Dockerfile b/docker/win32-static/Dockerfile index f039934a..98a9f65d 100644 --- a/docker/win32-static/Dockerfile +++ b/docker/win32-static/Dockerfile @@ -15,10 +15,10 @@ RUN apt-get update && apt-get -y install bash \ RUN apt-get install -y gcc-mingw-w64-i686 g++-mingw-w64-i686 # install wine -RUN dpkg --add-architecture i386 -RUN apt-get update +## RUN dpkg --add-architecture i386 +## RUN apt-get update -RUN apt-get install -y wine wine32:i386 +## RUN apt-get install -y wine wine32:i386 # create user RUN useradd -m elinks -s /bin/bash diff --git a/docker/win32-static/mes.sh b/docker/win32-static/mes.sh index 9149b62d..6784e0d8 100755 --- a/docker/win32-static/mes.sh +++ b/docker/win32-static/mes.sh @@ -22,6 +22,7 @@ meson setup ~/build --cross-file cross/linux-mingw32.txt \ -Dcss=true \ -Dcombining=false \ -Ddgi=true \ +-Ddoc=false \ -Dexmode=true \ -Dfastmem=true \ -Dfsp=false \ diff --git a/docker/win32-static/mes_js.sh b/docker/win32-static/mes_js.sh index dfcc3334..8daa1489 100755 --- a/docker/win32-static/mes_js.sh +++ b/docker/win32-static/mes_js.sh @@ -20,6 +20,7 @@ meson setup ~/buildjs --cross-file cross/linux-mingw32.txt \ -Dcss=true \ -Dcombining=false \ -Ddgi=true \ +-Ddoc=false \ -Dexmode=true \ -Dfastmem=true \ -Dfsp=false \ diff --git a/docker/win64-static/Dockerfile b/docker/win64-static/Dockerfile index 6daf75a6..703b779e 100644 --- a/docker/win64-static/Dockerfile +++ b/docker/win64-static/Dockerfile @@ -22,7 +22,7 @@ RUN apt-get install -y apt-src && \ RUN apt-get install -y gcc-mingw-w64-x86-64 g++-mingw-w64-x86-64 # install wine -RUN apt-get install -y wine +## RUN apt-get install -y wine # create user RUN useradd -m elinks -s /bin/bash diff --git a/docker/win64-static/mes.sh b/docker/win64-static/mes.sh index d341ef50..81b6db68 100755 --- a/docker/win64-static/mes.sh +++ b/docker/win64-static/mes.sh @@ -22,6 +22,7 @@ meson setup ~/build --cross-file cross/linux-mingw64.txt \ -Dcss=true \ -Dcombining=false \ -Ddgi=true \ +-Ddoc=false \ -Dexmode=true \ -Dfastmem=true \ -Dfsp=false \ diff --git a/docker/win64-static/mes_js.sh b/docker/win64-static/mes_js.sh index b685c740..2be6f03d 100755 --- a/docker/win64-static/mes_js.sh +++ b/docker/win64-static/mes_js.sh @@ -20,6 +20,7 @@ meson setup ~/buildjs --cross-file cross/linux-mingw64.txt \ -Dcss=true \ -Dcombining=false \ -Ddgi=true \ +-Ddoc=false \ -Dexmode=true \ -Dfastmem=true \ -Dfsp=false \