From 418871e1334ce2e111febc656bf2a1aabe3c2e6e Mon Sep 17 00:00:00 2001
From: Witold Filipczyk <witekfl@poczta.onet.pl>
Date: Sun, 29 Oct 2023 18:10:17 +0100
Subject: [PATCH] [docker] Changes for djgpp js build

---
 docker/djgpp/Dockerfile      | 37 +++++++++++++++++++++++++++++-------
 docker/djgpp/curl.diff       | 11 +++++++++++
 docker/djgpp/mes_djgpp_js.sh |  4 ++--
 3 files changed, 43 insertions(+), 9 deletions(-)
 create mode 100644 docker/djgpp/curl.diff

diff --git a/docker/djgpp/Dockerfile b/docker/djgpp/Dockerfile
index 6a5b03fa..4eae7108 100644
--- a/docker/djgpp/Dockerfile
+++ b/docker/djgpp/Dockerfile
@@ -47,16 +47,16 @@ sed -i -e 's/Libs\.private/#Libs.private/' /usr/local/lib/pkgconfig/sqlite3.pc;
 mkdir tmp; unzip lua522b.zip -d tmp; cp -a tmp/include /usr/local/; cp -a tmp/lib /usr/local/; rm -rf tmp; \
 cat <<EOF > /usr/local/lib/pkgconfig/lua.pc
 prefix=/usr/local
-exec_prefix=\$\{prefix\}
-libdir=\$\{exec_prefix\}/lib
-includedir=\$\{prefix\}/include
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
 
 Name: Lua
 Description: An Extensible Extension Language
 Version: 5.2
 Requires:
 Libs: -llua -lm
-Cflags: -I\$\{includedir\}
+Cflags: -I\${includedir}
 EOF
 
 # openssl
@@ -216,6 +216,29 @@ tar -xf libdom-0.4.1-src.tar.gz; \
 make -C libdom-0.4.1 install -j1 Q= PREFIX=/usr/local LIBDIR=lib COMPONENT_TYPE=lib-static
 ##rm -rf libdom-0.4.1
 
+# libcurl
+RUN cd /root; \
+rm -rf curl-8.4.0; \
+wget https://curl.se/download/curl-8.4.0.tar.xz; tar -xf curl-8.4.0.tar.xz
+ADD curl.diff /root/curl.diff
+RUN cd /root/curl-8.4.0; \
+patch -p1 < /root/curl.diff; \
+CFLAGS="-I/usr/local/include" make -j `nproc` -C lib -f Makefile.mk CFG=djgpp CROSSPREFIX=i586-pc-msdosdjgpp- ; \
+install /root/curl-8.4.0/lib/libcurl.a /usr/local/lib/ ; \
+cat <<EOF > /usr/local/lib/pkgconfig/libcurl.pc
+prefix=/usr/local
+exec_prefix=\${prefix}
+libdir=\${exec_prefix}/lib
+includedir=\${prefix}/include
+
+Name: libcurl
+Description: libcurl
+Version: 8.4.0
+Requires:
+Libs: -lcurl -lwatt
+Cflags: -I\${includedir}
+EOF
+
 # [*] elinks sources
 
 # get elinks source
@@ -224,6 +247,6 @@ ADD mes_djgpp.sh /root/elinks/mes_djgpp.sh
 RUN cd /root/elinks; \
 ./mes_djgpp.sh;
 
-# ADD mes_djgpp_js.sh /root/elinks/mes_djgpp_js.sh
-# RUN cd /root/elinks; \
-# ./mes_djgpp_js.sh;
+ADD mes_djgpp_js.sh /root/elinks/mes_djgpp_js.sh
+RUN cd /root/elinks; \
+./mes_djgpp_js.sh;
diff --git a/docker/djgpp/curl.diff b/docker/djgpp/curl.diff
new file mode 100644
index 00000000..a714983a
--- /dev/null
+++ b/docker/djgpp/curl.diff
@@ -0,0 +1,11 @@
+--- curl-8.4.0/lib/Makefile.mk.ddd      2023-10-29 16:59:33.084171145 +0000
++++ curl-8.4.0/lib/Makefile.mk  2023-10-29 17:00:29.738097194 +0000
+@@ -424,4 +424,8 @@
+ 
+ all: $(OBJ_DIR) $(TARGETS)
+ 
++install:
++	install -d /usr/local/include/curl
++	install -m 0644 $(HHEADERS) /usr/local/include/curl/
++	install -m 0644 $(libcurl_a_LIBRARY) /usr/local/lib/
+ endif
diff --git a/docker/djgpp/mes_djgpp_js.sh b/docker/djgpp/mes_djgpp_js.sh
index 81f8336f..8799be1c 100755
--- a/docker/djgpp/mes_djgpp_js.sh
+++ b/docker/djgpp/mes_djgpp_js.sh
@@ -5,8 +5,8 @@ rm -rf /tmp/builddir2
 LIBRARY_PATH="/usr/local/lib" \
 PKG_CONFIG_PATH="/usr/local/lib/pkgconfig" \
 C_INCLUDE_PATH="/usr/local/include" \
-CFLAGS="-I/usr/local/include -DWATT32_NO_NAMESPACE" \
-CXXFLAGS="-I/usr/local/include -DWATT32_NO_NAMESPACE" \
+CFLAGS="-I/usr/local/include -DWATT32_NO_NAMESPACE -DWATT32_NO_OLDIES" \
+CXXFLAGS="-I/usr/local/include -DWATT32_NO_NAMESPACE -DWATT32_NO_OLDIES" \
 LDFLAGS="-L/usr/local/lib" \
 meson setup /tmp/builddir2 --cross-file cross/linux-djgpp.txt \
 -D88-colors=false \