From 8c6d8d3529bd95fd0837110c50974526e78015e2 Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Wed, 30 Nov 2022 16:06:58 +0100
Subject: [PATCH] [docker] updated files for djgpp

---
 docker/djgpp/Dockerfile           | 10 +++++-----
 docker/djgpp/build_xmlplusplus.sh |  6 +++++-
 docker/djgpp/mes_djgpp.sh         |  2 ++
 docker/djgpp/mes_djgpp_js.sh      |  2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/docker/djgpp/Dockerfile b/docker/djgpp/Dockerfile
index 4f0c4249..41fd4028 100644
--- a/docker/djgpp/Dockerfile
+++ b/docker/djgpp/Dockerfile
@@ -5,7 +5,7 @@
 # [*] base system
 
 # get latest fedora
-FROM fedora:latest
+FROM fedora:37
 
 # prepare system
 RUN dnf -y update && dnf -y install bash wget \
@@ -29,7 +29,7 @@ wget http://ftp.delorie.com/pub/djgpp/current/v2apps/xz-525a.zip; \
 wget http://ftp.delorie.com/pub/djgpp/current/v2apps/bz2-108a.zip; \
 wget https://www.ibiblio.org/pub/micro/pc-stuff/freedos/files/repositories/1.3/apps/sqlite.zip; \
 wget http://ftp.delorie.com/pub/djgpp/current/v2gnu/licv116b.zip; \
-wget http://ftp.delorie.com/pub/djgpp/current/v2gnu/lidn138b.zip; \
+wget http://ftp.delorie.com/pub/djgpp/current/v2gnu/lidn138b.zip;
 
 RUN cd /root/zip; \
 mkdir tmp; unzip expat20br2.zip -d tmp; cp -a tmp/include /usr/local/; cp -a tmp/lib /usr/local; rm -rf tmp; \
@@ -48,9 +48,9 @@ sed -i -e 's/Libs\.private/#Libs.private/' /usr/local/lib/pkgconfig/sqlite3.pc
 
 # openssl
 RUN dnf -y install perl-FindBin; mkdir /root/tmp; cd /root/tmp; \
-wget https://www.openssl.org/source/openssl-1.1.1q.tar.gz; \
-tar -xf openssl-1.1.1q.tar.gz; \
-cd openssl-1.1.1q; \
+wget https://www.openssl.org/source/openssl-1.1.1s.tar.gz; \
+tar -xf openssl-1.1.1s.tar.gz; \
+cd openssl-1.1.1s; \
 CFLAGS="-I/usr/local/include -DWATT32_NO_OLDIES -DSHUT_RD=0 -L/usr/local/lib -fcommon" \
 ./Configure no-threads \
   no-tests \
diff --git a/docker/djgpp/build_xmlplusplus.sh b/docker/djgpp/build_xmlplusplus.sh
index 90988b4c..ab039ddf 100755
--- a/docker/djgpp/build_xmlplusplus.sh
+++ b/docker/djgpp/build_xmlplusplus.sh
@@ -4,7 +4,11 @@ export PKG_CONFIG_PATH=/usr/local/lib/pkgconfig
 
 NOCONFIGURE=1 ./autogen.sh
 
-CPPFLAGS="-I/usr/local/include/libxml2" ./configure --host=i586-pc-msdosdjgpp --enable-static=yes --enable-shared=no
+CPPFLAGS="-I/usr/local/include/libxml2" ./configure \
+--host=i586-pc-msdosdjgpp \
+--enable-static=yes \
+--enable-shared=no \
+--disable-documentation
 
 make -j12
 
diff --git a/docker/djgpp/mes_djgpp.sh b/docker/djgpp/mes_djgpp.sh
index beb7d4d5..6c052b39 100755
--- a/docker/djgpp/mes_djgpp.sh
+++ b/docker/djgpp/mes_djgpp.sh
@@ -19,6 +19,7 @@ meson /tmp/builddir --cross-file cross/linux-djgpp.txt \
 -Dcss=true \
 -Dcombining=false \
 -Ddgi=true \
+-Dexmode=true \
 -Dfastmem=true \
 -Dfsp=false \
 -Dgemini=true \
@@ -46,6 +47,7 @@ meson /tmp/builddir --cross-file cross/linux-djgpp.txt \
 -Dspidermonkey=false \
 -Dstatic=true \
 -Dterminfo=false \
+-Dtest=false \
 -Dtre=false \
 -Dtrue-color=false \
 -Dutf-8=false \
diff --git a/docker/djgpp/mes_djgpp_js.sh b/docker/djgpp/mes_djgpp_js.sh
index 4ed36d13..d8d48f55 100755
--- a/docker/djgpp/mes_djgpp_js.sh
+++ b/docker/djgpp/mes_djgpp_js.sh
@@ -20,6 +20,7 @@ meson /tmp/builddir2 --cross-file cross/linux-djgpp.txt \
 -Dcss=true \
 -Dcombining=false \
 -Ddgi=true \
+-Dexmode=true \
 -Dfastmem=true \
 -Dfsp=false \
 -Dgemini=true \
@@ -47,6 +48,7 @@ meson /tmp/builddir2 --cross-file cross/linux-djgpp.txt \
 -Dspidermonkey=false \
 -Dstatic=true \
 -Dterminfo=false \
+-Dtest=false \
 -Dtre=false \
 -Dtrue-color=false \
 -Dutf-8=false \