Rerender and Update to 5.12.10

.ci_support/linux_64_.yaml

@@ -17,7 +17,7 @@ dbus:
 docker_image:
 - quay.io/condaforge/linux-anvil-comp7
 expat:
-- '2.2'
+- '2'
 fontconfig:
 - '2.13'
 freetype:
@@ -45,8 +45,6 @@ openssl:
 pin_run_as_build:
   dbus:
     max_pin: x
-  expat:
-    max_pin: x.x
   fontconfig:
     max_pin: x
   freetype:

.ci_support/linux_aarch64_.yaml

@@ -21,7 +21,7 @@ dbus:
 docker_image:
 - quay.io/condaforge/linux-anvil-aarch64
 expat:
-- '2.2'
+- '2'
 fontconfig:
 - '2.13'
 freetype:
@@ -49,8 +49,6 @@ openssl:
 pin_run_as_build:
   dbus:
     max_pin: x
-  expat:
-    max_pin: x.x
   fontconfig:
     max_pin: x
   freetype:

.ci_support/osx_64_.yaml

@@ -1,5 +1,7 @@
 MACOSX_DEPLOYMENT_TARGET:
 - '10.12'
+MACOSX_SDK_VERSION:
+- '10.15'
 c_compiler:
 - clang
 c_compiler_version:

.ci_support/osx_arm64_.yaml

@@ -0,0 +1,52 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '11.0'
+c_compiler:
+- clang
+c_compiler_version:
+- '11'
+channel_sources:
+- conda-forge/label/rust_dev,conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '11'
+icu:
+- '68'
+jpeg:
+- '9'
+libpng:
+- '1.6'
+macos_machine:
+- arm64-apple-darwin20.0.0
+nspr:
+- '4'
+nss:
+- '3'
+openssl:
+- 1.1.1
+pin_run_as_build:
+  jpeg:
+    max_pin: x
+  libpng:
+    max_pin: x.x
+  nspr:
+    max_pin: x
+  nss:
+    max_pin: x
+  openssl:
+    max_pin: x.x.x
+  sqlite:
+    max_pin: x
+  zlib:
+    max_pin: x.x
+sqlite:
+- '3'
+target_platform:
+- osx-arm64
+zip_keys:
+- - c_compiler_version
+  - cxx_compiler_version
+zlib:
+- '1.2'

conda-forge.yml

@@ -6,3 +6,4 @@ azure:
 # qt 5.12 claims to not support ppc64le. It likely needs patching
 # to get it through the build process
 provider: {linux_aarch64: default}
+build_platform: {osx_arm64: osx_64}

recipe/build.sh

@@ -62,12 +62,10 @@ rm -rf $PREFIX/bin/protoc
 # grep -R include_dirs . | grep ninja | grep    _h_env_ | cut -d':' -f 1 | sort | uniq | xargs stat -c "%s %n" 2>/dev/null | sort -h | head -n 10
 # Then find the .gn or .gni files that these ninja files were created from and figure out wtf is going on.
 
-# qtwebengine needs python 2
-conda create -y --prefix "${SRC_DIR}/python2_hack" -c https://repo.continuum.io/pkgs/main --no-deps python=2
-export PATH=${SRC_DIR}/python2_hack/bin:${PATH}
-
 if [[ ${HOST} =~ .*linux.* ]]; then
-
+    # qtwebengine compilation needs python2
+    conda create -y --prefix "${SRC_DIR}/python2_hack" --no-deps python=2
+    export PATH=${SRC_DIR}/python2_hack/bin:${PATH}
     if ! which ruby > /dev/null 2>&1; then
         echo "You need ruby to build qtwebkit"
         exit 1
@@ -245,6 +243,11 @@ if [[ ${HOST} =~ .*linux.* ]]; then
 fi
 
 if [[ ${HOST} =~ .*darwin.* ]]; then
+    # qtwebengine compilation needs python2
+    # System python is python2 on Mac, so we hack around that
+    mkdir -p ${SRC_DIR}/python2_hack/
+    ln -s /usr/bin/python ${SRC_DIR}/python2_hack/
+    export PATH=${SRC_DIR}/python2_hack/:${PATH}
 
     # Avoid Xcode
     cp "${RECIPE_DIR}"/xcrun .
@@ -261,15 +264,14 @@ if [[ ${HOST} =~ .*darwin.* ]]; then
     PATH=${PWD}:${PATH}
 
     # Because of the use of Objective-C Generics we need at least MacOSX10.11.sdk
-    if [[ $(basename $CONDA_BUILD_SYSROOT) != "MacOSX10.12.sdk" ]]; then
-      echo "WARNING: You asked me to use $CONDA_BUILD_SYSROOT as the MacOS SDK"
-      echo "         But because of the use of Objective-C Generics we need at"
-      echo "         least MacOSX10.12.sdk"
-      CONDA_BUILD_SYSROOT=/opt/MacOSX10.12.sdk
-      if [[ ! -d $CONDA_BUILD_SYSROOT ]]; then
-        echo "ERROR: $CONDA_BUILD_SYSROOT is not a directory"
-        exit 1
-      fi
+    if [[ ${MACOSX_SDK_VERSION:-10.13} != "10.13" && ${MACOSX_SDK_VERSION:-10.13} != "10.14" && ${MACOSX_SDK_VERSION:-10.13} != "10.15" ]]; then
+      echo "WARNING: You asked me to use ${MACOSX_SDK_VERSION:-10.13} as the MacOS SDK"
+      echo "         But we need at least 10.13 and at most 10.15"
+    fi
+
+    if [[ $(basename $CONDA_BUILD_SYSROOT) != "MacOSX${MACOSX_SDK_VERSION:-10.13}.sdk" ]]; then
+      echo "ERROR: mismatch between MACOSX_SDK_VERSION(${MACOSX_SDK_VERSION:-10.13}) and CONDA_BUILD_SYSROOT($(basename $CONDA_BUILD_SYSROOT))"
+      exit 1
     fi
 
     sed -i.bak "s/-Wno-c++11-narrowing'/-Wno-c++11-narrowing', '-Wno-elaborated-enum-base'/g" qtwebengine/src/3rdparty/gn/build/gen.py
@@ -314,7 +316,7 @@ if [[ ${HOST} =~ .*darwin.* ]]; then
                 -no-egl \
                 -no-openssl \
                 -optimize-size \
-                -sdk macosx10.12
+                -sdk macosx${MACOSX_SDK_VERSION:-10.13}
 
 # For quicker turnaround when e.g. checking compilers optimizations
 #                -skip qtwebsockets -skip qtwebchannel -skip qtwebengine -skip qtsvg -skip qtsensors -skip qtcanvas3d -skip qtconnectivity -skip declarative -skip multimedia -skip qttools -skip qtlocation -skip qt3d
@@ -361,7 +363,7 @@ if [[ ${HOST} =~ .*darwin.* ]]; then
     # https://bugreports.qt.io/browse/QTBUG-41238
     sed -i '' 's/macosx.*$/macosx/g' mkspecs/qdevice.pri
     # We allow macOS SDK 10.12 while upstream requires 10.13 (as of Qt 5.12.1).
-    sed -i '' 's/QT_MAC_SDK_VERSION_MIN = 10\..*/QT_MAC_SDK_VERSION_MIN = 10\.12/g' mkspecs/common/macx.conf
+    sed -i '' 's/QT_MAC_SDK_VERSION_MIN = 10\..*/QT_MAC_SDK_VERSION_MIN = 10\.15/g' mkspecs/common/macx.conf
     # We may want to replace these with \$\${QMAKE_MAC_SDK_PATH}/ instead?
     sed -i '' "s|${CONDA_BUILD_SYSROOT}/|/|g" mkspecs/modules/*.pri
     CMAKE_FILES=$(find lib/cmake -name "Qt*.cmake")