From 8aa9c2ebe134354d3795c616499290811c6e2005 Mon Sep 17 00:00:00 2001 From: Syping Date: Fri, 31 Jul 2020 20:45:26 +0200 Subject: [PATCH 1/3] update libjpeg-turbo, LLVM and fix bugs --- Dockerfile.shared | 10 ++++++---- Dockerfile.static | 10 ++++++---- qt_build | 10 +++++++--- 3 files changed, 19 insertions(+), 11 deletions(-) diff --git a/Dockerfile.shared b/Dockerfile.shared index c2b29f9..2e01d14 100644 --- a/Dockerfile.shared +++ b/Dockerfile.shared @@ -1,5 +1,5 @@ # Debian Buster is recommended -FROM syping/llvm-mingw-debian:10.0 +FROM syping/llvm-mingw-debian:10.0.1 # Custom Directory ENV CUSTOM_DIRECTORY YES @@ -15,11 +15,11 @@ ENV QT_SERIES 5.15 ENV QT_BUILD 0 ENV ZLIB_VERSION 1.2.11 ENV LIBPNG_VERSION 1.6.37 -ENV LIBJPEGTURBO_VERSION 2.0.4 -ENV LIBRESSL_VERSION 3.1.2 +ENV LIBJPEGTURBO_VERSION 2.0.5 +ENV LIBRESSL_VERSION 3.1.3 ENV OPENSSL_VERSION 1.1.1g ENV ICU_VERSION 67.1 -ENV HB_VERSION 2.6.7 +ENV HB_VERSION 2.7.0 # SSL Choice ENV CUSTOM_SSL YES @@ -37,6 +37,8 @@ ENV BUILD_MINGW64_STATIC NO # DON'T EDIT BELOW THIS LINE # ############################## +WORKDIR / + COPY qt_build /opt/qt_build/bin/ RUN rm -f /bin/sh && \ diff --git a/Dockerfile.static b/Dockerfile.static index b8f8c01..14810fa 100644 --- a/Dockerfile.static +++ b/Dockerfile.static @@ -1,5 +1,5 @@ # Debian Buster is recommended -FROM syping/llvm-mingw-debian:10.0 +FROM syping/llvm-mingw-debian:10.0.1 # Custom Directory ENV CUSTOM_DIRECTORY YES @@ -15,11 +15,11 @@ ENV QT_SERIES 5.15 ENV QT_BUILD 0 ENV ZLIB_VERSION 1.2.11 ENV LIBPNG_VERSION 1.6.37 -ENV LIBJPEGTURBO_VERSION 2.0.4 -ENV LIBRESSL_VERSION 3.1.2 +ENV LIBJPEGTURBO_VERSION 2.0.5 +ENV LIBRESSL_VERSION 3.1.3 ENV OPENSSL_VERSION 1.1.1g ENV ICU_VERSION 67.1 -ENV HB_VERSION 2.6.7 +ENV HB_VERSION 2.7.0 # SSL Choice ENV CUSTOM_SSL YES @@ -37,6 +37,8 @@ ENV BUILD_MINGW64_SHARED NO # DON'T EDIT BELOW THIS LINE # ############################## +WORKDIR / + COPY qt_build /opt/qt_build/bin/ COPY qmake-static /usr/local/bin/ diff --git a/qt_build b/qt_build index 5e07f22..5c69194 100644 --- a/qt_build +++ b/qt_build @@ -22,11 +22,11 @@ if [ ! "${CUSTOM_VERSION}" == "YES" ]; then # Third Party ZLIB_VERSION=1.2.11 LIBPNG_VERSION=1.6.37 - LIBJPEGTURBO_VERSION=2.0.4 - LIBRESSL_VERSION=3.1.2 + LIBJPEGTURBO_VERSION=2.0.5 + LIBRESSL_VERSION=3.1.3 OPENSSL_VERSION=1.1.1g ICU_VERSION=67.1 - HB_VERSION=2.6.7 # HarfBuzz + HB_VERSION=2.7.0 # HarfBuzz # Qt Framework 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 "#include \"../linux-g++/qplatformdefs.h\"" > "${ARCHIVE}/qtbase/mkspecs/linux-aarch64-gnu-g++/qplatformdefs.h" 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} SOURCE_DIR_QT="${SOURCE_DIR}/${ARCHIVE}" } From be506f39261346a409e1f57886667191a6464795 Mon Sep 17 00:00:00 2001 From: Syping Date: Fri, 31 Jul 2020 20:51:51 +0200 Subject: [PATCH 2/3] fix qt_build permission --- qt_build | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 qt_build diff --git a/qt_build b/qt_build old mode 100644 new mode 100755 From e95d2e2db6a07fb67d52db1ec36dd6c9e16a9dbc Mon Sep 17 00:00:00 2001 From: Syping Date: Fri, 31 Jul 2020 20:56:25 +0200 Subject: [PATCH 3/3] fix patch folder --- qt_build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt_build b/qt_build index 5c69194..fadabca 100755 --- a/qt_build +++ b/qt_build @@ -757,7 +757,7 @@ function qt_source { 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" + wget -q -O "${ARCHIVE}/qtbase/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite.cpp" "https://gist.githubusercontent.com/Syping/d6c3cb1a8cfa678f959252a7faae5f9c/raw/qwindowsfontenginedirectwrite.cpp" fi QT_VERSION=${VERSION} SOURCE_DIR_QT="${SOURCE_DIR}/${ARCHIVE}"