From 2172e1ba6f4058c1d5756aa72576186abbc6473e Mon Sep 17 00:00:00 2001 From: Syping Date: Sat, 21 Nov 2020 17:47:28 +0100 Subject: [PATCH] Update Qt and libraries --- Dockerfile.shared | 10 +++++----- Dockerfile.static | 12 ++++++------ docker_build | 3 +++ qt_build | 10 +++++----- 4 files changed, 19 insertions(+), 16 deletions(-) create mode 100755 docker_build diff --git a/Dockerfile.shared b/Dockerfile.shared index ff06923..6d216ee 100644 --- a/Dockerfile.shared +++ b/Dockerfile.shared @@ -12,13 +12,13 @@ ENV QT_SYSCONF_DIR /etc/xdg # Custom Version ENV CUSTOM_VERSION YES ENV QT_SERIES 5.15 -ENV QT_BUILD 1 +ENV QT_BUILD 2 ENV ZLIB_VERSION 1.2.11 ENV LIBPNG_VERSION 1.6.37 -ENV LIBJPEGTURBO_VERSION 2.0.5 -ENV LIBRESSL_VERSION 3.1.4 -ENV OPENSSL_VERSION 1.1.1g -ENV ICU_VERSION 67.1 +ENV LIBJPEGTURBO_VERSION 2.0.6 +ENV LIBRESSL_VERSION 3.2.2 +ENV OPENSSL_VERSION 1.1.1h +ENV ICU_VERSION 68.1 ENV HB_VERSION 2.7.2 # SSL Choice diff --git a/Dockerfile.static b/Dockerfile.static index 99e0019..cbdf19b 100644 --- a/Dockerfile.static +++ b/Dockerfile.static @@ -11,14 +11,14 @@ ENV QT_SYSCONF_DIR /etc/xdg # Custom Version ENV CUSTOM_VERSION YES -ENV QT_SERIES 5.15 -ENV QT_BUILD 1 +ENV QT_SERIES 5.15 +ENV QT_BUILD 2 ENV ZLIB_VERSION 1.2.11 ENV LIBPNG_VERSION 1.6.37 -ENV LIBJPEGTURBO_VERSION 2.0.5 -ENV LIBRESSL_VERSION 3.1.4 -ENV OPENSSL_VERSION 1.1.1g -ENV ICU_VERSION 67.1 +ENV LIBJPEGTURBO_VERSION 2.0.6 +ENV LIBRESSL_VERSION 3.2.2 +ENV OPENSSL_VERSION 1.1.1h +ENV ICU_VERSION 68.1 ENV HB_VERSION 2.7.2 # SSL Choice diff --git a/docker_build b/docker_build new file mode 100755 index 0000000..c0ae43d --- /dev/null +++ b/docker_build @@ -0,0 +1,3 @@ +#!/bin/bash +docker build -t qt-llvm-mingw-docker:shared -f Dockerfile.shared . +docker build -t qt-llvm-mingw-docker:static -f Dockerfile.static . diff --git a/qt_build b/qt_build index ff9ece9..609f306 100755 --- a/qt_build +++ b/qt_build @@ -22,15 +22,15 @@ if [ ! "${CUSTOM_VERSION}" == "YES" ]; then # Third Party ZLIB_VERSION=1.2.11 LIBPNG_VERSION=1.6.37 - LIBJPEGTURBO_VERSION=2.0.5 - LIBRESSL_VERSION=3.1.4 - OPENSSL_VERSION=1.1.1g - ICU_VERSION=67.1 + LIBJPEGTURBO_VERSION=2.0.6 + LIBRESSL_VERSION=3.2.2 + OPENSSL_VERSION=1.1.1h + ICU_VERSION=68.1 HB_VERSION=2.7.2 # HarfBuzz # Qt Framework QT_SERIES=5.15 # (x.x).y - QT_BUILD=1 # x.x.(y) + QT_BUILD=2 # x.x.(y) fi # --------------------------------------