From e727982d7de1b333a7d850c607717bcdd72144d5 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Tue, 2 Jan 2024 10:41:52 +0100 Subject: [PATCH] [docker] Updated netsurf libs for djgpp --- docker/djgpp/Dockerfile | 1 + docker/djgpp/build_hubbub.sh | 8 ++++---- docker/djgpp/build_libcss.sh | 14 +++++++------- docker/djgpp/build_libdom.sh | 8 ++++---- docker/djgpp/build_netsurf.sh | 8 ++++---- docker/djgpp/build_parserutils.sh | 8 ++++---- docker/djgpp/mes_djgpp_js.sh | 2 +- 7 files changed, 25 insertions(+), 24 deletions(-) diff --git a/docker/djgpp/Dockerfile b/docker/djgpp/Dockerfile index 2492e934..04aeecd8 100644 --- a/docker/djgpp/Dockerfile +++ b/docker/djgpp/Dockerfile @@ -60,6 +60,7 @@ ADD build_wapcaplet.sh /home/elinks/ RUN runuser -u elinks bash /home/elinks/build_wapcaplet.sh # libhubbub +RUN dnf -y install gperf ADD build_hubbub.sh /home/elinks/ RUN runuser -u elinks bash /home/elinks/build_hubbub.sh diff --git a/docker/djgpp/build_hubbub.sh b/docker/djgpp/build_hubbub.sh index 4f1cf21a..b334eb90 100644 --- a/docker/djgpp/build_hubbub.sh +++ b/docker/djgpp/build_hubbub.sh @@ -7,7 +7,7 @@ export LDFLAGS="-L$HOME/lib" export CC="i586-pc-msdosdjgpp-gcc" export AR="i586-pc-msdosdjgpp-ar" cd -wget http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.7-src.tar.gz -rm -rf libhubbub-0.3.7 -tar -xf libhubbub-0.3.7-src.tar.gz -make -C libhubbub-0.3.7 install -j1 Q= PREFIX=$HOME LIBDIR=lib COMPONENT_TYPE=lib-static +wget http://download.netsurf-browser.org/libs/releases/libhubbub-0.3.8-src.tar.gz +rm -rf libhubbub-0.3.8 +tar -xf libhubbub-0.3.8-src.tar.gz +make -C libhubbub-0.3.8 install -j1 Q= PREFIX=$HOME LIBDIR=lib COMPONENT_TYPE=lib-static diff --git a/docker/djgpp/build_libcss.sh b/docker/djgpp/build_libcss.sh index 9ca318b9..b366e83b 100644 --- a/docker/djgpp/build_libcss.sh +++ b/docker/djgpp/build_libcss.sh @@ -1,9 +1,9 @@ cd -rm -rf libcss-0.9.1 -wget http://download.netsurf-browser.org/libs/releases/libcss-0.9.1-src.tar.gz; tar -xf libcss-0.9.1-src.tar.gz -tar xf libcss-0.9.1-src.tar.gz -cd libcss-0.9.1 -patch -p1 < ../libCSS-restrict.diff || exit 1 +rm -rf libcss-0.9.2 +wget http://download.netsurf-browser.org/libs/releases/libcss-0.9.2-src.tar.gz; tar -xf libcss-0.9.2-src.tar.gz +tar xf libcss-0.9.2-src.tar.gz +cd libcss-0.9.2 +#patch -p1 < ../libCSS-restrict.diff || exit 1 printf '\ngen: $(PRE_TARGETS)\n' >> Makefile cd .. export CFLAGS="-O2 -Wno-error" @@ -12,7 +12,7 @@ export CC="i586-pc-msdosdjgpp-gcc" export AR="i586-pc-msdosdjgpp-ar" export HOST="i586-pc-msdosdjgpp" export BUILD_CC=gcc -make -C libcss-0.9.1 -j1 Q= PREFIX=$HOME LIBDIR=lib gen +make -C libcss-0.9.2 -j1 Q= PREFIX=$HOME LIBDIR=lib gen export LIBRARY_PATH="$HOME/lib" export PKG_CONFIG_PATH="$HOME/lib/pkgconfig" @@ -23,4 +23,4 @@ export LDFLAGS="-L$HOME/lib" export CC="i586-pc-msdosdjgpp-gcc" export AR="i586-pc-msdosdjgpp-ar" export HOST="i586-pc-msdosdjgpp" -make -C libcss-0.9.1 install -j1 Q= PREFIX=$HOME LIBDIR=lib COMPONENT_TYPE=lib-static +make -C libcss-0.9.2 install -j1 Q= PREFIX=$HOME LIBDIR=lib COMPONENT_TYPE=lib-static diff --git a/docker/djgpp/build_libdom.sh b/docker/djgpp/build_libdom.sh index e71637c8..0df4ddc3 100644 --- a/docker/djgpp/build_libdom.sh +++ b/docker/djgpp/build_libdom.sh @@ -7,7 +7,7 @@ export LDFLAGS="-L$HOME/lib" export CC="i586-pc-msdosdjgpp-gcc" export AR="i586-pc-msdosdjgpp-ar" cd -wget http://download.netsurf-browser.org/libs/releases/libdom-0.4.1-src.tar.gz -rm -rf libdom-0.4.1 -tar -xf libdom-0.4.1-src.tar.gz -make -C libdom-0.4.1 install -j1 Q= PREFIX=$HOME LIBDIR=lib COMPONENT_TYPE=lib-static +wget http://download.netsurf-browser.org/libs/releases/libdom-0.4.2-src.tar.gz +rm -rf libdom-0.4.2 +tar -xf libdom-0.4.2-src.tar.gz +make -C libdom-0.4.2 install -j1 Q= PREFIX=$HOME LIBDIR=lib COMPONENT_TYPE=lib-static diff --git a/docker/djgpp/build_netsurf.sh b/docker/djgpp/build_netsurf.sh index 5519342c..1d094dcb 100644 --- a/docker/djgpp/build_netsurf.sh +++ b/docker/djgpp/build_netsurf.sh @@ -1,5 +1,5 @@ cd -wget http://download.netsurf-browser.org/libs/releases/buildsystem-1.9.tar.gz -rm -rf buildsystem-1.9 -tar -xf buildsystem-1.9.tar.gz -make -C buildsystem-1.9 install PREFIX=$HOME +wget http://download.netsurf-browser.org/libs/releases/buildsystem-1.10.tar.gz +rm -rf buildsystem-1.10 +tar -xf buildsystem-1.10.tar.gz +make -C buildsystem-1.10 install PREFIX=$HOME diff --git a/docker/djgpp/build_parserutils.sh b/docker/djgpp/build_parserutils.sh index 4803668b..693ddcaa 100644 --- a/docker/djgpp/build_parserutils.sh +++ b/docker/djgpp/build_parserutils.sh @@ -7,7 +7,7 @@ export LDFLAGS="-L$HOME/lib" export CC="i586-pc-msdosdjgpp-gcc" export AR="i586-pc-msdosdjgpp-ar" cd -wget http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.4-src.tar.gz -rm -rf libparserutils-0.2.4 -tar -xf libparserutils-0.2.4-src.tar.gz -make -C libparserutils-0.2.4 install -j1 Q= PREFIX=$HOME LIBDIR=lib COMPONENT_TYPE=lib-static +wget http://download.netsurf-browser.org/libs/releases/libparserutils-0.2.5-src.tar.gz +rm -rf libparserutils-0.2.5 +tar -xf libparserutils-0.2.5-src.tar.gz +make -C libparserutils-0.2.5 install -j1 Q= PREFIX=$HOME LIBDIR=lib COMPONENT_TYPE=lib-static diff --git a/docker/djgpp/mes_djgpp_js.sh b/docker/djgpp/mes_djgpp_js.sh index 4dede44c..1492410b 100755 --- a/docker/djgpp/mes_djgpp_js.sh +++ b/docker/djgpp/mes_djgpp_js.sh @@ -9,7 +9,7 @@ PKG_CONFIG_PATH="$HOME/lib/pkgconfig" \ C_INCLUDE_PATH="$HOME/include" \ CFLAGS="-O2 -I$HOME/include -DWATT32_NO_NAMESPACE -DWATT32_NO_OLDIES" \ CXXFLAGS="-O2 -I$HOME/include -DWATT32_NO_NAMESPACE -DWATT32_NO_OLDIES" \ -LDFLAGS="-L$HOME/lib" \ +LDFLAGS="-lm -L$HOME/lib" \ meson setup /tmp/builddir2 --cross-file cross/linux-djgpp.txt \ -D88-colors=false \ -D256-colors=false \