From 1d677720a4b73695d35d4241a9002b82edaa4488 Mon Sep 17 00:00:00 2001 From: Witold Filipczyk Date: Tue, 2 Jan 2024 11:05:50 +0100 Subject: [PATCH] [docker] updated netsurf libs for win64-static --- docker/djgpp/libCSS-restrict.diff | 19 ------------------- docker/win32-static/libCSS-restrict.diff | 19 ------------------- docker/win64-static/Dockerfile | 2 +- docker/win64-static/build_hubbub.sh | 8 ++++---- docker/win64-static/build_libcss.sh | 13 ++++++------- docker/win64-static/build_libdom.sh | 8 ++++---- docker/win64-static/build_netsurf.sh | 6 +++--- docker/win64-static/build_parserutils.sh | 8 ++++---- docker/win64-static/libCSS-restrict.diff | 19 ------------------- 9 files changed, 22 insertions(+), 80 deletions(-) delete mode 100644 docker/djgpp/libCSS-restrict.diff delete mode 100644 docker/win32-static/libCSS-restrict.diff delete mode 100644 docker/win64-static/libCSS-restrict.diff diff --git a/docker/djgpp/libCSS-restrict.diff b/docker/djgpp/libCSS-restrict.diff deleted file mode 100644 index 69e9497b..00000000 --- a/docker/djgpp/libCSS-restrict.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- libcss-0.8.0/include/libcss/computed.h.orig 2018-08-22 15:27:44.000000000 +0200 -+++ libcss-0.8.0/include/libcss/computed.h 2018-12-29 19:02:55.633399014 +0100 -@@ -79,13 +79,13 @@ - css_error css_computed_style_destroy(css_computed_style *style); - - css_error css_computed_style_compose( -- const css_computed_style *restrict parent, -- const css_computed_style *restrict child, -+ const css_computed_style *__restrict parent, -+ const css_computed_style *__restrict child, - css_error (*compute_font_size)(void *pw, - const struct css_hint *parent, - struct css_hint *size), - void *pw, -- css_computed_style **restrict result); -+ css_computed_style **__restrict result); - - /****************************************************************************** - * Property accessors below here * diff --git a/docker/win32-static/libCSS-restrict.diff b/docker/win32-static/libCSS-restrict.diff deleted file mode 100644 index 69e9497b..00000000 --- a/docker/win32-static/libCSS-restrict.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- libcss-0.8.0/include/libcss/computed.h.orig 2018-08-22 15:27:44.000000000 +0200 -+++ libcss-0.8.0/include/libcss/computed.h 2018-12-29 19:02:55.633399014 +0100 -@@ -79,13 +79,13 @@ - css_error css_computed_style_destroy(css_computed_style *style); - - css_error css_computed_style_compose( -- const css_computed_style *restrict parent, -- const css_computed_style *restrict child, -+ const css_computed_style *__restrict parent, -+ const css_computed_style *__restrict child, - css_error (*compute_font_size)(void *pw, - const struct css_hint *parent, - struct css_hint *size), - void *pw, -- css_computed_style **restrict result); -+ css_computed_style **__restrict result); - - /****************************************************************************** - * Property accessors below here * diff --git a/docker/win64-static/Dockerfile b/docker/win64-static/Dockerfile index 703b779e..10e48213 100644 --- a/docker/win64-static/Dockerfile +++ b/docker/win64-static/Dockerfile @@ -9,7 +9,7 @@ FROM debian:bookworm # prepare system RUN apt-get update && apt-get -y install bash \ - rsync vim screen git make automake grep sed meson + rsync vim screen git make automake grep sed meson gperf # [*] source build tools diff --git a/docker/win64-static/build_hubbub.sh b/docker/win64-static/build_hubbub.sh index a8ee6cad..594be6eb 100644 --- a/docker/win64-static/build_hubbub.sh +++ b/docker/win64-static/build_hubbub.sh @@ -7,7 +7,7 @@ export LDFLAGS="-L$HOME/lib" export CC="x86_64-w64-mingw32-gcc" export AR="x86_64-w64-mingw32-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/win64-static/build_libcss.sh b/docker/win64-static/build_libcss.sh index 8d290e04..4268e153 100644 --- a/docker/win64-static/build_libcss.sh +++ b/docker/win64-static/build_libcss.sh @@ -1,9 +1,8 @@ cd -wget http://download.netsurf-browser.org/libs/releases/libcss-0.9.1-src.tar.gz; tar -xf libcss-0.9.1-src.tar.gz -rm -rf libcss-0.9.1 -tar -xf libcss-0.9.1-src.tar.gz -cd libcss-0.9.1 -patch -p1 < ../libCSS-restrict.diff +wget http://download.netsurf-browser.org/libs/releases/libcss-0.9.2-src.tar.gz; tar -xf libcss-0.9.2-src.tar.gz +rm -rf libcss-0.9.2 +tar -xf libcss-0.9.2-src.tar.gz +cd libcss-0.9.2 printf '\ngen: $(PRE_TARGETS)\n' >> Makefile cd .. export LIBRARY_PATH="$HOME/lib" @@ -16,7 +15,7 @@ export CC="x86_64-w64-mingw32-gcc" export AR="x86_64-w64-mingw32-ar" export HOST="x86_64-w64-mingw32" export BUILD_CC=cc -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" @@ -27,4 +26,4 @@ export LDFLAGS="-L$HOME/lib" export CC="x86_64-w64-mingw32-gcc" export AR="x86_64-w64-mingw32-ar" export HOST="x86_64-w64-mingw32" -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/win64-static/build_libdom.sh b/docker/win64-static/build_libdom.sh index 777c6cfe..62c0d09e 100644 --- a/docker/win64-static/build_libdom.sh +++ b/docker/win64-static/build_libdom.sh @@ -7,7 +7,7 @@ export LDFLAGS="-L$HOME/lib" export CC="x86_64-w64-mingw32-gcc" export AR="x86_64-w64-mingw32-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/win64-static/build_netsurf.sh b/docker/win64-static/build_netsurf.sh index e0db898e..c0251a84 100644 --- a/docker/win64-static/build_netsurf.sh +++ b/docker/win64-static/build_netsurf.sh @@ -1,4 +1,4 @@ cd -wget http://download.netsurf-browser.org/libs/releases/buildsystem-1.9.tar.gz -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 +tar -xf buildsystem-1.10.tar.gz +make -C buildsystem-1.10 install PREFIX=$HOME diff --git a/docker/win64-static/build_parserutils.sh b/docker/win64-static/build_parserutils.sh index 6b67c80f..77821024 100644 --- a/docker/win64-static/build_parserutils.sh +++ b/docker/win64-static/build_parserutils.sh @@ -7,7 +7,7 @@ export LDFLAGS="-L$HOME/lib" export CC="x86_64-w64-mingw32-gcc" export AR="x86_64-w64-mingw32-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/win64-static/libCSS-restrict.diff b/docker/win64-static/libCSS-restrict.diff deleted file mode 100644 index 69e9497b..00000000 --- a/docker/win64-static/libCSS-restrict.diff +++ /dev/null @@ -1,19 +0,0 @@ ---- libcss-0.8.0/include/libcss/computed.h.orig 2018-08-22 15:27:44.000000000 +0200 -+++ libcss-0.8.0/include/libcss/computed.h 2018-12-29 19:02:55.633399014 +0100 -@@ -79,13 +79,13 @@ - css_error css_computed_style_destroy(css_computed_style *style); - - css_error css_computed_style_compose( -- const css_computed_style *restrict parent, -- const css_computed_style *restrict child, -+ const css_computed_style *__restrict parent, -+ const css_computed_style *__restrict child, - css_error (*compute_font_size)(void *pw, - const struct css_hint *parent, - struct css_hint *size), - void *pw, -- css_computed_style **restrict result); -+ css_computed_style **__restrict result); - - /****************************************************************************** - * Property accessors below here *