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

update libjpeg-turbo, LLVM and fix bugs

Browse source
This commit is contained in:
Syping 2020-07-31 20:45:26 +02:00
parent ffee7d00e9
commit 8aa9c2ebe1
3 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Dockerfile.shared
View file

@ -1,5 +1,5 @@
# Debian Buster is recommended # Debian Buster is recommended
FROM syping/llvm-mingw-debian:10.0 FROM syping/llvm-mingw-debian:10.0.1
# Custom Directory # Custom Directory
ENV CUSTOM_DIRECTORY YES ENV CUSTOM_DIRECTORY YES
@ -15,11 +15,11 @@ ENV QT_SERIES 5.15
ENV QT_BUILD 0 ENV QT_BUILD 0
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.4 ENV LIBJPEGTURBO_VERSION 2.0.5
ENV LIBRESSL_VERSION 3.1.2 ENV LIBRESSL_VERSION 3.1.3
ENV OPENSSL_VERSION 1.1.1g ENV OPENSSL_VERSION 1.1.1g
ENV ICU_VERSION 67.1 ENV ICU_VERSION 67.1
ENV HB_VERSION 2.6.7 ENV HB_VERSION 2.7.0
# SSL Choice # SSL Choice
ENV CUSTOM_SSL YES ENV CUSTOM_SSL YES
@ -37,6 +37,8 @@ ENV BUILD_MINGW64_STATIC NO
# DON'T EDIT BELOW THIS LINE # # DON'T EDIT BELOW THIS LINE #
############################## ##############################
WORKDIR /
COPY qt_build /opt/qt_build/bin/ COPY qt_build /opt/qt_build/bin/
RUN rm -f /bin/sh && \ RUN rm -f /bin/sh && \

10
Dockerfile.static
View file

@ -1,5 +1,5 @@
# Debian Buster is recommended # Debian Buster is recommended
FROM syping/llvm-mingw-debian:10.0 FROM syping/llvm-mingw-debian:10.0.1
# Custom Directory # Custom Directory
ENV CUSTOM_DIRECTORY YES ENV CUSTOM_DIRECTORY YES
@ -15,11 +15,11 @@ ENV QT_SERIES 5.15
ENV QT_BUILD 0 ENV QT_BUILD 0
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.4 ENV LIBJPEGTURBO_VERSION 2.0.5
ENV LIBRESSL_VERSION 3.1.2 ENV LIBRESSL_VERSION 3.1.3
ENV OPENSSL_VERSION 1.1.1g ENV OPENSSL_VERSION 1.1.1g
ENV ICU_VERSION 67.1 ENV ICU_VERSION 67.1
ENV HB_VERSION 2.6.7 ENV HB_VERSION 2.7.0
# SSL Choice # SSL Choice
ENV CUSTOM_SSL YES ENV CUSTOM_SSL YES
@ -37,6 +37,8 @@ ENV BUILD_MINGW64_SHARED NO
# DON'T EDIT BELOW THIS LINE # # DON'T EDIT BELOW THIS LINE #
############################## ##############################
WORKDIR /
COPY qt_build /opt/qt_build/bin/ COPY qt_build /opt/qt_build/bin/
COPY qmake-static /usr/local/bin/ COPY qmake-static /usr/local/bin/

10
qt_build
View file

@ -22,11 +22,11 @@ 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.4 LIBJPEGTURBO_VERSION=2.0.5
LIBRESSL_VERSION=3.1.2 LIBRESSL_VERSION=3.1.3
OPENSSL_VERSION=1.1.1g OPENSSL_VERSION=1.1.1g
ICU_VERSION=67.1 ICU_VERSION=67.1
HB_VERSION=2.6.7 # HarfBuzz HB_VERSION=2.7.0 # HarfBuzz
# Qt Framework # Qt Framework
QT_SERIES=5.15 # (x.x).y QT_SERIES=5.15 # (x.x).y
@ -755,6 +755,10 @@ function qt_source {
echo -e "MAKEFILE_GENERATOR=UNIX\nCONFIG+=incremental\nQMAKE_INCREMENTAL_STYLE=sublib\ninclude(../common/linux.conf)\ninclude(../common/gcc-base-unix.conf)\ninclude(../common/g++-unix.conf)\nQMAKE_CC=aarch64-linux-gnu-gcc\nQMAKE_CXX=aarch64-linux-gnu-g++\nQMAKE_LINK=aarch64-linux-gnu-g++\nQMAKE_LINK_SHLIB=aarch64-linux-gnu-g++\nQMAKE_AR=aarch64-linux-gnu-ar cqs\nQMAKE_OBJCOPY=aarch64-linux-gnu-objcopy\nQMAKE_NM=aarch64-linux-gnu-nm -P\nQMAKE_STRIP=aarch64-linux-gnu-strip\nload(qt_config)" > "${ARCHIVE}/qtbase/mkspecs/linux-aarch64-gnu-g++/qmake.conf" echo -e "MAKEFILE_GENERATOR=UNIX\nCONFIG+=incremental\nQMAKE_INCREMENTAL_STYLE=sublib\ninclude(../common/linux.conf)\ninclude(../common/gcc-base-unix.conf)\ninclude(../common/g++-unix.conf)\nQMAKE_CC=aarch64-linux-gnu-gcc\nQMAKE_CXX=aarch64-linux-gnu-g++\nQMAKE_LINK=aarch64-linux-gnu-g++\nQMAKE_LINK_SHLIB=aarch64-linux-gnu-g++\nQMAKE_AR=aarch64-linux-gnu-ar cqs\nQMAKE_OBJCOPY=aarch64-linux-gnu-objcopy\nQMAKE_NM=aarch64-linux-gnu-nm -P\nQMAKE_STRIP=aarch64-linux-gnu-strip\nload(qt_config)" > "${ARCHIVE}/qtbase/mkspecs/linux-aarch64-gnu-g++/qmake.conf"
echo -e "#include \"../linux-g++/qplatformdefs.h\"" > "${ARCHIVE}/qtbase/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h" echo -e "#include \"../linux-g++/qplatformdefs.h\"" > "${ARCHIVE}/qtbase/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h"
fi fi
# Patch Qt 5.15.0 DirectWrite bug
if [ "$VERSION" == "5.15.0" ]; then
wget -q -O "${ARCHIVE}/qtbase/src/platformsupport/fontdatabases/qwindowsfontenginedirectwrite.cpp" "https://gist.githubusercontent.com/Syping/d6c3cb1a8cfa678f959252a7faae5f9c/raw/qwindowsfontenginedirectwrite.cpp"
fi
QT_VERSION=${VERSION} QT_VERSION=${VERSION}
SOURCE_DIR_QT="${SOURCE_DIR}/${ARCHIVE}" SOURCE_DIR_QT="${SOURCE_DIR}/${ARCHIVE}"
} }