Syping/qt5-llvm-mingw-docker
1
0
Fork 0
mirror of https://gitlab.com/Syping/qt5-llvm-mingw-docker.git synced 2024-11-21 21:30:23 +01:00
Code Issues Projects Releases Wiki Activity

Update Qt and libraries

Browse source
This commit is contained in:
Syping 2020-11-21 17:47:28 +01:00
parent c83067b134
commit 2172e1ba6f
4 changed files with 19 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile.shared
View file

@ -12,13 +12,13 @@ ENV QT_SYSCONF_DIR /etc/xdg
# Custom Version # Custom Version
ENV CUSTOM_VERSION YES ENV CUSTOM_VERSION YES
ENV QT_SERIES 5.15 ENV QT_SERIES 5.15
ENV QT_BUILD 1 ENV QT_BUILD 2
ENV ZLIB_VERSION 1.2.11 ENV ZLIB_VERSION 1.2.11
ENV LIBPNG_VERSION 1.6.37 ENV LIBPNG_VERSION 1.6.37
ENV LIBJPEGTURBO_VERSION 2.0.5 ENV LIBJPEGTURBO_VERSION 2.0.6
ENV LIBRESSL_VERSION 3.1.4 ENV LIBRESSL_VERSION 3.2.2
ENV OPENSSL_VERSION 1.1.1g ENV OPENSSL_VERSION 1.1.1h
ENV ICU_VERSION 67.1 ENV ICU_VERSION 68.1
ENV HB_VERSION 2.7.2 ENV HB_VERSION 2.7.2
# SSL Choice # SSL Choice

12
Dockerfile.static
View file

@ -11,14 +11,14 @@ ENV QT_SYSCONF_DIR /etc/xdg
# Custom Version # Custom Version
ENV CUSTOM_VERSION YES ENV CUSTOM_VERSION YES
ENV QT_SERIES 5.15 ENV QT_SERIES 5.15
ENV QT_BUILD 1 ENV QT_BUILD 2
ENV ZLIB_VERSION 1.2.11 ENV ZLIB_VERSION 1.2.11
ENV LIBPNG_VERSION 1.6.37 ENV LIBPNG_VERSION 1.6.37
ENV LIBJPEGTURBO_VERSION 2.0.5 ENV LIBJPEGTURBO_VERSION 2.0.6
ENV LIBRESSL_VERSION 3.1.4 ENV LIBRESSL_VERSION 3.2.2
ENV OPENSSL_VERSION 1.1.1g ENV OPENSSL_VERSION 1.1.1h
ENV ICU_VERSION 67.1 ENV ICU_VERSION 68.1
ENV HB_VERSION 2.7.2 ENV HB_VERSION 2.7.2
# SSL Choice # SSL Choice

3
docker_build Executable file
View file

@ -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 .

10
qt_build
View file

@ -22,15 +22,15 @@ if [ ! "${CUSTOM_VERSION}" == "YES" ]; then
# Third Party # Third Party
ZLIB_VERSION=1.2.11 ZLIB_VERSION=1.2.11
LIBPNG_VERSION=1.6.37 LIBPNG_VERSION=1.6.37
LIBJPEGTURBO_VERSION=2.0.5 LIBJPEGTURBO_VERSION=2.0.6
LIBRESSL_VERSION=3.1.4 LIBRESSL_VERSION=3.2.2
OPENSSL_VERSION=1.1.1g OPENSSL_VERSION=1.1.1h
ICU_VERSION=67.1 ICU_VERSION=68.1
HB_VERSION=2.7.2 # HarfBuzz HB_VERSION=2.7.2 # HarfBuzz
# Qt Framework # Qt Framework
QT_SERIES=5.15 # (x.x).y QT_SERIES=5.15 # (x.x).y
QT_BUILD=1 # x.x.(y) QT_BUILD=2 # x.x.(y)
fi fi
# -------------------------------------- # --------------------------------------