update MXE build container

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

scripts/docker/mxe-build-container/Dockerfile

@@ -3,7 +3,7 @@
 #
 
 # Start from Ubuntu
-From ubuntu:20.04
+From ubuntu:22.04
 
 # very often master is broken, so we pass in a known good SHA
 ARG mxe_sha=master
@@ -40,7 +40,8 @@ DEBIAN_FRONTEND=noninteractive apt-get install --no-install-recommends -y \
     patch \
     perl \
     pkg-config \
-    python \
+    python3 \
+    python3-mako \
     ruby \
     sed \
     unzip \
@@ -62,6 +63,7 @@ ADD qtconnectivity-1.patch /win/mxe/src/qtconnectivity-1.patch
 # Move the settings into place to build everything that we need
 # separate download from build so that we can redo the build
 ADD settings.mk /win/mxe/settings.mk
+RUN [ -f /usr/bin/python ] || ln -s /usr/bin/python3 /usr/bin/python
 RUN cd /win/mxe ; \
     make -j 6 download 2>&1 | tee mxe-build.log
 RUN cd /win/mxe ; \

scripts/docker/mxe-build-container/build-container.sh

@@ -3,11 +3,11 @@ set -x
 set -e
 
 # known good MXE sha
-MXE_SHA="8966a64"
+MXE_SHA="0d21cf2e31d4e6c0"
 SCRIPTPATH=$(dirname $0)
 
 # version of the docker image
-VERSION=2.1
+VERSION=3.0
 
 pushd $SCRIPTPATH
 

scripts/docker/mxe-build-container/settings.mk

@@ -8,7 +8,7 @@ JOBS := 8
 # This variable controls the targets that will build.
 MXE_TARGETS :=  x86_64-w64-mingw32.shared i686-w64-mingw32.shared
 
-MXE_PLUGIN_DIRS := plugins/gcc10
+# MXE_PLUGIN_DIRS := plugins/gcc10
 
 # The three lines below makes `make` build these "local packages" instead of all packages.
 # The ordering of the list appears weird, but this seems to help to get the build done