From d0c1131441865bb277269cb103cc126ab70e51fd Mon Sep 17 00:00:00 2001
From: Faraz Fallahi <fffaraz@gmail.com>
Date: Sun, 24 Apr 2022 16:34:14 -0400
Subject: [PATCH] Qt6

---
 Dockerfile.mxe    |  6 ++++--
 Dockerfile.win32d |  5 +----
 Dockerfile.win32s |  5 +----
 Dockerfile.win64d |  5 +----
 Dockerfile.win64s | 13 ++++++++++---
 notes.txt         |  2 ++
 6 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/Dockerfile.mxe b/Dockerfile.mxe
index d0b0f1c..994e968 100644
--- a/Dockerfile.mxe
+++ b/Dockerfile.mxe
@@ -1,7 +1,7 @@
 FROM ubuntu:20.04
 ENTRYPOINT ["/bin/bash"]
 
-#RUN echo 'Acquire::http { Proxy "http://192.168.1.2:3142"; };' >> /etc/apt/apt.conf.d/00proxy
+RUN echo 'Acquire::http { Proxy "http://192.168.1.2:3142"; };' >> /etc/apt/apt.conf.d/00proxy
 
 RUN \
     export DEBIAN_FRONTEND=noninteractive && \
@@ -12,7 +12,9 @@ RUN \
         g++ g++-multilib gettext git gperf intltool iputils-ping libc6-dev-i386 \
         libffi-dev libgdk-pixbuf2.0-dev libltdl-dev libssl-dev libtool-bin \
         libxml-parser-perl lzip make nano openssl p7zip-full patch perl \
-        pkg-config python python-mako ruby scons sed unzip wget xz-utils && \
+        pkg-config ruby scons sed unzip wget xz-utils libgl-dev \
+        python3 python3-mako python3-pkg-resources python3-setuptools python-is-python3 \
+        && \
     apt -y autoremove && \
     apt -y autoclean && \
     apt -y clean && \
diff --git a/Dockerfile.win32d b/Dockerfile.win32d
index 1454ca9..a35bcb3 100644
--- a/Dockerfile.win32d
+++ b/Dockerfile.win32d
@@ -2,8 +2,5 @@ FROM fffaraz/qt:mxe
 
 RUN \
     cd /opt/mxe && \
-    NPROC=$(($(nproc)+4)) && \
-    make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='i686-w64-mingw32.shared' qt6-qtbase && \
-    ln -s /opt/mxe/usr/bin/i686-w64-mingw32.shared-qmake-qt6 /usr/bin/qmake && \
-    qmake --version && \
+    make --jobs=$(nproc) JOBS=$(nproc) MXE_TARGETS='i686-w64-mingw32.shared' qt6-qtbase && \
     exit 0
diff --git a/Dockerfile.win32s b/Dockerfile.win32s
index 55fad03..22c39e1 100644
--- a/Dockerfile.win32s
+++ b/Dockerfile.win32s
@@ -2,8 +2,5 @@ FROM fffaraz/qt:mxe
 
 RUN \
     cd /opt/mxe && \
-    NPROC=$(($(nproc)+4)) && \
-    make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='i686-w64-mingw32.static' qt6-qtbase && \
-    ln -s /opt/mxe/usr/bin/i686-w64-mingw32.static-qmake-qt6 /usr/bin/qmake && \
-    qmake --version && \
+    make --jobs=$(nproc) JOBS=$(nproc) MXE_TARGETS='i686-w64-mingw32.static' qt6-qtbase && \
     exit 0
diff --git a/Dockerfile.win64d b/Dockerfile.win64d
index 02a3657..477c70d 100644
--- a/Dockerfile.win64d
+++ b/Dockerfile.win64d
@@ -2,8 +2,5 @@ FROM fffaraz/qt:mxe
 
 RUN \
     cd /opt/mxe && \
-    NPROC=$(($(nproc)+4)) && \
-    make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='x86_64-w64-mingw32.shared' qt6-qtbase && \
-    ln -s /opt/mxe/usr/bin/x86_64-w64-mingw32.shared-qmake-qt6 /usr/bin/qmake && \
-    qmake --version && \
+    make --jobs=$(nproc) JOBS=$(nproc) MXE_TARGETS='x86_64-w64-mingw32.shared' qt6-qtbase && \
     exit 0
diff --git a/Dockerfile.win64s b/Dockerfile.win64s
index 3da9ca5..3e67d6c 100644
--- a/Dockerfile.win64s
+++ b/Dockerfile.win64s
@@ -2,8 +2,15 @@ FROM fffaraz/qt:mxe
 
 RUN \
     cd /opt/mxe && \
-    NPROC=$(($(nproc)+4)) && \
-    make --jobs=$NPROC JOBS=$NPROC MXE_TARGETS='x86_64-w64-mingw32.static' qtbase && \
-    ln -s /opt/mxe/usr/bin/x86_64-w64-mingw32.static-qmake-qt5 /usr/bin/qmake && \
+    make --jobs=$(nproc) JOBS=$(nproc) MXE_TARGETS='x86_64-w64-mingw32.static' qt6-qtbase && \
+    exit 0
+
+ENV PATH="${PATH}:/opt/mxe/usr/x86_64-w64-mingw32.static/qt6/bin"
+
+RUN \
+    set -eux && \
+    echo $PATH && \
+    ln -s /opt/mxe/usr/bin/x86_64-w64-mingw32.static-cmake /usr/local/bin/cmake && \
+    cmake --version && \
     qmake --version && \
     exit 0
diff --git a/notes.txt b/notes.txt
index 00adb91..6fde42b 100644
--- a/notes.txt
+++ b/notes.txt
@@ -11,3 +11,5 @@ https://github.com/qt/qtbase/blob/dev/src/network/kernel/qurltlds_p.h
 ln -s /opt/mxe/usr/bin/x86_64-w64-mingw32.static-cmake /usr/bin/cmake
 ENV CMAKE_PREFIX_PATH="/opt/mxe/usr/x86_64-w64-mingw32.static/qt5"
 ---
+docker run --rm -it fffaraz/qt:mxe
+---