Rerender and Update to 5.12.10

recipe/build.sh

@@ -63,7 +63,7 @@ rm -rf $PREFIX/bin/protoc
 # 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
+conda create -y --prefix "${SRC_DIR}/python2_hack" --no-deps python=2
 export PATH=${SRC_DIR}/python2_hack/bin:${PATH}
 
 if [[ ${HOST} =~ .*linux.* ]]; then

recipe/meta.yaml

@@ -3,15 +3,15 @@
 #   error: unknown type name 'SecKeyAlgorithm'
 # .. these 10.11 support patches should be removed anyway as they could break some things.
 # .. such as pop-up Window mouse-events.
-{% set version = "5.12.9" %}
+{% set version = "5.12.10" %}
 
 package:
   name: qt
   version: {{ version }}
 
 source:
   - url: http://download.qt.io/official_releases/qt/{{ version.rpartition('.')[0] }}/{{ version }}/single/qt-everywhere-src-{{ version }}.tar.xz
-    md5: fa2646280cf38180689c29c393cddd05
+    sha256: 3e0ee1e57f5cf3eeb038d0b4b22c7eb442285c62639290756b39dc93a1d0e14f
     patches:
 
       # qtbase
@@ -50,6 +50,10 @@ source:
       # qtscript
       - patches/0001-qtscript-mark-cti_vm_throw-as-REFERENCED_FROM_ASM.patch
 
+      # OSX BigSur compatibility
+      # Remove on next release of 5.12.11
+      - patches/0100-osx_bigsur_compatibility.diff
+
   - url: http://download.qt.io/community_releases/5.9/5.9.0-final/qtwebkit-opensource-src-5.9.0.tar.xz            # [qtwebkit == 'true']
     sha256: 8dad193b740055a998312e04a040f2e32a923c0823b2d239b24eab08276a4e04                                      # [qtwebkit == 'true']
     folder: qtwebkit                                                                                              # [qtwebkit == 'true']
@@ -68,7 +72,7 @@ source:
     folder: opengl32sw                                                                                            # [win64]
 
 build:
-  number: 4
+  number: 0
   detect_binary_files_with_prefix: true
   # QtWebEngine fails on Linux unless we merge
   merge_build_host: true  # [linux]

recipe/patches/0100-osx_bigsur_compatibility.diff

@@ -0,0 +1,22 @@
+diff --git a/qtbase/src/plugins/platforms/cocoa/qnsview_drawing.mm b/qtbase/src/plugins/platforms/cocoa/qnsview_drawing.mm
+index 116a9a7..14e45a0 100644
+--- a/qtbase/src/plugins/platforms/cocoa/qnsview_drawing.mm
++++ b/qtbase/src/plugins/platforms/cocoa/qnsview_drawing.mm
+@@ -95,8 +95,15 @@
+     // by AppKit at a point where we've already set up other parts of the platform plugin
+     // based on the presence of layers or not. Once we've rewritten these parts to support
+     // dynamically picking up layer enablement we can let AppKit do its thing.
+-    return QMacVersion::buildSDK() >= QOperatingSystemVersion::MacOSMojave
+-        && QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSMojave;
++
++    if (QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSBigSur)
++        return true; // Big Sur always enables layer-backing, regardless of SDK
++
++    if (QMacVersion::currentRuntime() >= QOperatingSystemVersion::MacOSMojave
++        && QMacVersion::buildSDK() >= QOperatingSystemVersion::MacOSMojave)
++        return true; // Mojave and Catalina enable layers based on the app's SDK
++
++    return false; // Prior versions needed explicitly enabled layer backing
+ }
+
+ - (BOOL)layerExplicitlyRequested