From 1735afdef240fb6b0606f37fc125bd8c2211916f Mon Sep 17 00:00:00 2001 From: Nicolas Roduit Date: Fri, 18 Aug 2023 16:54:20 +0200 Subject: [PATCH] Update 4.2.0 --- content/getting-started/building-weasis.en.md | 4 ++-- layouts/shortcodes/latest-download.html | 6 +++--- layouts/shortcodes/old-download.html | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/content/getting-started/building-weasis.en.md b/content/getting-started/building-weasis.en.md index ef4ecebd..a5f0a6d0 100755 --- a/content/getting-started/building-weasis.en.md +++ b/content/getting-started/building-weasis.en.md @@ -9,7 +9,7 @@ These instructions describe how to build Weasis directly from the Git repository **Prerequisites** -1. JDK 20 or higher +1. JDK 21 or higher 2. Maven 3.5.3 or higher
If your computer is behind a proxy server, [configure maven](https://maven.apache.org/guides/mini/guide-proxies.html). 3. Git @@ -64,7 +64,7 @@ However, it is possible to run a local script `package-weasis.sh` on most system {{< tabs groupId="build-native" >}} {{% tab title="Bash" %}} {{< highlight shell >}} -./build/script/package-weasis.sh --jdk "/home/.jdks/openjdk-20" +./build/script/package-weasis.sh --jdk "/home/.jdks/openjdk-21" {{< /highlight >}} {{% /tab %}} {{< /tabs >}} diff --git a/layouts/shortcodes/latest-download.html b/layouts/shortcodes/latest-download.html index 43ac967a..97444455 100755 --- a/layouts/shortcodes/latest-download.html +++ b/layouts/shortcodes/latest-download.html @@ -31,10 +31,10 @@ {{ $val.name }} - {{ cond (eq $package ".msi") "May require Visual C++ redistributable 2015" + {{ cond (eq $package ".msi") "" (cond (eq $package ".pkg") (cond (eq $arch "arm 64-bit") "Requires macOS 11 or higher" "Requires macOS 10.11 or higher" ) - (cond (eq $arch "arm 32-bit") "Requires GLIBC_2.7. Only tested with Raspberry Pi 4" - (cond (eq $arch "arm 64-bit") "Requires GLIBC_2.27" "Requires GLIBC_2.14" ))) + (cond (eq $arch "arm 32-bit") "Requires GLIBC_2.17. Only tested with Raspberry Pi 4" + (cond (eq $arch "arm 64-bit") "Requires GLIBC_2.27" "Requires GLIBC_2.17" ))) }} {{ end }} diff --git a/layouts/shortcodes/old-download.html b/layouts/shortcodes/old-download.html index 1a23ae1d..a3ad45f4 100755 --- a/layouts/shortcodes/old-download.html +++ b/layouts/shortcodes/old-download.html @@ -39,10 +39,10 @@ {{ $val.name }} - {{ cond ( ge $elem_index 1) "" (cond (eq $package ".msi") "May require Visual C++ redistributable 2015" + {{ cond ( ge $elem_index 1) "" (cond (eq $package ".msi") "" (cond (eq $package ".pkg") (cond (eq $arch "arm 64-bit") "Requires macOS 11 or higher" "Requires macOS 10.11 or higher" ) - (cond (eq $arch "arm 32-bit") "Requires GLIBC_2.7. Only tested with Raspberry Pi 4" - (cond (eq $arch "arm 64-bit") "Requires GLIBC_2.27" "Requires GLIBC_2.14" )))) + (cond (eq $arch "arm 32-bit") "Requires GLIBC_2.17. Only tested with Raspberry Pi 4" + (cond (eq $arch "arm 64-bit") "Requires GLIBC_2.27" "Requires GLIBC_2.17" )))) }} {{ end }}