Continuation of @jschuelller's 5.12.4 PR.

recipe/build.sh

@@ -1,3 +1,7 @@
+set -x
+
+env
+
 # Clean config for dirty builds
 # -----------------------------
 rm -f .qmake.stash .qmake.cache || true
@@ -74,8 +78,8 @@ if [[ ${HOST} =~ .*linux.* ]]; then
     export CC=${GCC}
     export CXX=${GXX}
 
-    conda create -y --prefix "${SRC_DIR}/openssl_hack" -c https://repo.continuum.io/pkgs/main \
-                  --no-deps --yes --copy --prefix "${SRC_DIR}/openssl_hack" \
+    conda create -y --prefix "${SRC_DIR}/openssl_hack" -c https://repo.continuum.io/pkgs/main  \
+                  --no-deps --yes --copy --prefix "${SRC_DIR}/openssl_hack"  \
                   openssl=${openssl}
     export OPENSSL_LIBS="-L${SRC_DIR}/openssl_hack/lib -lssl -lcrypto"
     rm -rf ${PREFIX}/include/openssl
@@ -214,8 +218,31 @@ if [[ ${HOST} =~ .*linux.* ]]; then
     make install
 fi
 
+function parse_macos_sdk_ver
+{
+  local _SYSROOT=${1}; shift
+  local _SDK_VER_VAR=${1} ; shift
+  local _SDK_VER_MAJOR_VAR=${1} ; shift
+  local _SDK_VER_MINOR_VAR=${1} ; shift
+  re='[^0-9]*([0-9\.]+)\.\.*'
+  if [[ "${_SYSROOT}" =~ $re ]]; then
+    local _SDK_VER=${BASH_REMATCH[1]}
+    re='([0-9]*)\.([0-9]*).*'
+    if [[ "${_SDK_VER}" =~ $re ]]; then
+      local _SDK_VER_MAJOR=${BASH_REMATCH[1]}
+      local _SDK_VER_MINOR=${BASH_REMATCH[2]}
+    fi
+  fi
+  eval "${_SDK_VER_VAR}=${_SDK_VER}"
+  eval "${_SDK_VER_MAJOR_VAR}=${_SDK_VER_MAJOR}"
+  eval "${_SDK_VER_MINOR_VAR}=${_SDK_VER_MINOR}"
+}
+
 if [[ ${HOST} =~ .*darwin.* ]]; then
 
+    parse_macos_sdk_ver ${CONDA_BUILD_SYSROOT} OSX_SDK_VER OSX_SDK_VER_MAJOR OSX_SDK_VER_MINOR
+    printf "INFO :: Parsed ${CONDA_BUILD_SYSROOT} as:\n  OSX_SDK_VER=$OSX_SDK_VER OSX_SDK_VER_MAJOR=$SDK_VER_MAJOR OSX_SDK_VER_MINOR=$SDK_VER_MINOR"
+
     # Avoid Xcode
     cp "${RECIPE_DIR}"/xcrun .
     cp "${RECIPE_DIR}"/xcodebuild .
@@ -231,15 +258,10 @@ 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 [ ${OSX_SDK_VER_MAJOR} -lt 11 ] && [ ${OSX_SDK_VER_MINOR} -lt 11 ]; then
+      echo "ERROR: You asked me to use $CONDA_BUILD_SYSROOT as MacOS SDK (maj: ${SDK_VER_MAJOR} min: ${SDK_VER_MINOR})"
+      echo "         But because of the use of Objective-C Generics we need at \least MacOSX10.11.sdk"
+      exit 1
     fi
 
     #             -qtlibinfix .conda \
@@ -276,7 +298,7 @@ if [[ ${HOST} =~ .*darwin.* ]]; then
                 -no-egl \
                 -no-openssl \
                 -optimize-size \
-                -sdk macosx10.12
+                -sdk macosx${OSX_SDK_VER}
 
 # 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
@@ -323,7 +345,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 = ${OSX_SDK_VER_MAJOR}\.${OSX_SDK_VER_MINOR}/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")

recipe/conda_build_config.yaml

@@ -1,2 +1,4 @@
+CONDA_BUILD_SYSROOT:       # [osx]
+  - /opt/MacOSX10.12.sdk   # [osx]
 MACOSX_DEPLOYMENT_TARGET:  # [osx]
   - '10.12'                # [osx]

recipe/meta.yaml

@@ -3,29 +3,45 @@
 #   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.1" %}
+{% set version = "5.12.4" %}
+{% set build_number = "0" %}
+{% set dev_nature = os.environ.get('CONDA_BUILD_DEBUG_PACKAGE', '') %}
+{% if dev_nature != '' %}
+  {% set dev_nature = "_dev" %}
+  {% set patches = "patches/git" %}
+{% else %}
+  {% set patches = "patches" %}
+{% endif %}
 
 package:
   name: qt
   version: {{ version }}
 
 source:
-  - url: http://download.qt.io/official_releases/qt/5.12/{{ version }}/single/qt-everywhere-src-{{ version }}.tar.xz  # [not win]
-    md5: 6a37466c8c40e87d4a19c3f286ec2542  # [not win]
-  - url: http://download.qt.io/official_releases/qt/5.12/{{ version }}/single/qt-everywhere-src-{{ version }}.zip  # [win]
-    md5: 4649d4e51ca836fbde08565582353140  # [win]
+  {% if dev_nature == "_dev" %}
+  - git_url: git://code.qt.io/qt/qt5.git
+    git_tag: {{ version }}
+  {% else %}
+  - url: http://download.qt.io/official_releases/qt/5.12/{{ version }}/single/qt-everywhere-src-{{ version }}.tar.xz
+    md5: dda95b0239d13c5276834177af3a8588
+  {% endif %}
+
     patches:
+
       # qtbase
-      - patches/0010-osx-xctest-check.patch
-      - patches/0011-osx-allow-any-xcrun-in-PATH.patch
-      - patches/0015-qtbase-use-better-clang-optimize-size.patch
-      - patches/0016-qtbase-use-better-gcc-optimize-size.patch
-      - patches/0017-qtbase-never-enable-new-dtags.patch
-      - patches/0019-qtbase-link-xcb-shm.patch
-      - patches/0020-qtbase-Do-not-set-PKG_CONFIG_SYSROOT_DIR-when-sysroot-passe.patch
-      #- patches/0021-qtbase-Add-debugging-to-debug-qtConfResolveLibs-and-also-to.patch
+      - {{ patches }}/0001-qtbase-osx-xctest-check.patch
+      - {{ patches }}/0002-qtbase-osx-allow-any-xcrun-in-PATH.patch
+      - {{ patches }}/0003-qtbase-use-better-clang-optimize-size.patch
+      - {{ patches }}/0004-qtbase-never-enable-new-dtags.patch
+      - {{ patches }}/0005-qtbase-link-xcb-shm.patch
+      - {{ patches }}/0006-qtbase-Do-not-set-PKG_CONFIG_SYSROOT_DIR-when-sysroo.patch
+      - {{ patches }}/0007-qtbase-Disable-kTLSProtocol13-for-macOS-10.12.patch
+      - {{ patches }}/0008-qtbase-Define-kIOSurfaceSuccess-if-it-is-not-defined.patch
+      # - {{ patches }}/9999-qtbase-use-better-gcc-optimize-size.patch
+
       # qtwinextras
       - patches/0001-shobjidl-Fix-compile-guard-around-SHARDAPPIDINFOLINK.patch
+
       # qtwebengine
       - patches/0001-qtwebengine-allow-any-xcblah-in-PATH.patch
       - patches/0002-qtwebengine-find_sdk-respect-CONDA_BUILD_SYSROOT.patch
@@ -40,6 +56,7 @@ source:
       - patches/0012-qtwebengine-Ignore-glibc-2-17-min-version-check.patch
       - patches/0013-qtwebengine-missing_EVIOCGPROP.diff
       - patches/0014-qtwebengine-HAVE_SENDMMSG.diff
+
       # qtscript
       - patches/0001-qtscript-mark-cti_vm_throw-as-REFERENCED_FROM_ASM.patch
 
@@ -61,7 +78,8 @@ source:
     folder: opengl32sw                                                                                            # [win64]
 
 build:
-  number: 0
+  number: {{ build_number }}
+  string: {{ build_number }}{{ dev_nature }}
   skip: True  # [win and vc != 14]
   detect_binary_files_with_prefix: true
   # QtWebEngine fails on Linux unless we merge

recipe/patches/0010-osx-xctest-check.patch → recipe/patches/0001-qtbase-osx-xctest-check.patch

@@ -1,18 +1,18 @@
-From 6f8cb6288314f2f01bd7e8be67fd424df75a8685 Mon Sep 17 00:00:00 2001
+From 1a52e1e3100a10af1be58a218c09fc778e1ed3ef Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 10 Dec 2018 14:40:29 -0600
-Subject: [PATCH] osx: xctest check
+Subject: [PATCH 1/6] qtbase: osx: xctest check
 
 Change-Id: Icd9e4e910ad8abff6716e5dc6c7e6244c8668df8
 ---
  src/testlib/testlib.pro | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/qtbase/src/testlib/testlib.pro b/qtbase/src/testlib/testlib.pro
-index 46b61dac07..44e21d8436 100644
+index 34bb581e02..49f1fd43ed 100644
 --- a/qtbase/src/testlib/testlib.pro
 +++ b/qtbase/src/testlib/testlib.pro
-@@ -96,7 +96,7 @@ mac {
+@@ -111,7 +111,7 @@ mac {
      }
 
      # XCTest support (disabled for now)
@@ -22,5 +22,5 @@ index 46b61dac07..44e21d8436 100644
          HEADERS += qxctestlogger_p.h
 
 -- 
-2.19.1
+2.20.1
 

recipe/patches/0011-osx-allow-any-xcrun-in-PATH.patch → recipe/patches/0002-qtbase-osx-allow-any-xcrun-in-PATH.patch

@@ -1,18 +1,20 @@
-From abbd4e486df16fa45642523527892a250e5579f5 Mon Sep 17 00:00:00 2001
+From 16578d1a599f914acd421b595be655e3a63c731d Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 10 Dec 2018 14:45:19 -0600
-Subject: [PATCH] osx: allow any xcrun in PATH
+Subject: [PATCH 2/6] qtbase: osx: allow any xcrun in PATH
 
 Change-Id: I6066837f34fbed47340aa280d696e9deb3c79fc7
 ---
- configure                            | 8 ++++----
- mkspecs/features/mac/default_pre.prf | 8 ++++----
- mkspecs/features/mac/sdk.mk          | 2 +-
- mkspecs/features/mac/sdk.prf         | 4 ++--
- 4 files changed, 11 insertions(+), 11 deletions(-)
+ configure                            | 10 +++++-----
+ mkspecs/features/mac/default_pre.prf |  8 ++++----
+ mkspecs/features/mac/sdk.mk          |  2 +-
+ mkspecs/features/mac/sdk.prf         |  4 ++--
+ qtbase/mkspecs/features/mac/sdk.mk   | 12 ++++++++++++
+ 5 files changed, 24 insertions(+), 12 deletions(-)
+ create mode 100644 qtbase/mkspecs/features/mac/sdk.mk
 
 diff --git a/qtbase/configure b/qtbase/configure
-index ef7bad1bfc..2d13ec38f1 100755
+index ef7bad1bfc..0d1f198d9f 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
 @@ -232,7 +232,7 @@ macSDKify()
@@ -33,6 +35,15 @@ index ef7bad1bfc..2d13ec38f1 100755
                  val=$(echo $sdk_val $(echo $val | cut -s -d ' ' -f 2-))
                  echo "$var=$val"
              ;;
+@@ -318,7 +318,7 @@ fi
+ #-------------------------------------------------------------------------------
+
+ if [ "$BUILD_ON_MAC" = "yes" ]; then
+-    if ! /usr/bin/xcode-select --print-path >/dev/null 2>&1; then
++    if ! xcode-select --print-path >/dev/null 2>&1; then
+         echo >&2
+         echo "   No Xcode selected. Please install Xcode via the App Store, " >&2
+         echo "   or the command line developer tools via xcode-select --install, " >&2
 @@ -329,8 +329,8 @@ if [ "$BUILD_ON_MAC" = "yes" ]; then
      fi
 
@@ -78,17 +89,19 @@ index e3534561a5..56a7e62155 100644
          isEmpty(QMAKE_XCODE_VERSION): error("Could not resolve Xcode version.")
          unset(xcode_version)
 diff --git a/qtbase/mkspecs/features/mac/sdk.mk b/qtbase/mkspecs/features/mac/sdk.mk
-index c0266f2139..f912d6016a 100644
+index c40f58c987..349a0e58f2 100644
 --- a/qtbase/mkspecs/features/mac/sdk.mk
 +++ b/qtbase/mkspecs/features/mac/sdk.mk
-@@ -1,4 +1,4 @@
--CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version)
-+CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version)
+@@ -1,6 +1,6 @@
 
- ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
-     $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
+ ifeq ($(QT_MAC_SDK_NO_VERSION_CHECK),)
+-    CHECK_SDK_COMMAND = /usr/bin/xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
++    CHECK_SDK_COMMAND = xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version 2>&1
+     CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) $(CHECK_SDK_COMMAND))
+     ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
+         # We don't want to complain about out of date SDK unless the target needs to be remade.
 diff --git a/qtbase/mkspecs/features/mac/sdk.prf b/qtbase/mkspecs/features/mac/sdk.prf
-index 8360dd8b38..908015124d 100644
+index 3a9c2778bb..12c1c82639 100644
 --- a/qtbase/mkspecs/features/mac/sdk.prf
 +++ b/qtbase/mkspecs/features/mac/sdk.prf
 @@ -18,7 +18,7 @@ defineReplace(xcodeSDKInfo) {
@@ -100,7 +113,7 @@ index 8360dd8b38..908015124d 100644
          # --show-sdk-platform-path won't work for Command Line Tools; this is fine
          # only used by the XCTest backend to testlib
          isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
-@@ -50,7 +50,7 @@ for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_
+@@ -53,7 +53,7 @@ for(tool, $$list(QMAKE_CC QMAKE_CXX QMAKE_FIX_RPATH QMAKE_AR QMAKE_RANLIB QMAKE_
      value = $$eval($$tool)
      isEmpty(value): next()
 
@@ -109,6 +122,24 @@ index 8360dd8b38..908015124d 100644
      isEmpty(sysrooted): next()
 
      $$tool = $$sysrooted $$member(value, 1, -1)
+diff --git a/qtbase/qtbase/mkspecs/features/mac/sdk.mk b/qtbase/qtbase/mkspecs/features/mac/sdk.mk
+new file mode 100644
+index 0000000000..f912d6016a
+--- /dev/null
++++ b/qtbase/qtbase/mkspecs/features/mac/sdk.mk
+@@ -0,0 +1,12 @@
++CURRENT_MAC_SDK_VERSION := $(shell DEVELOPER_DIR=$(EXPORT_QMAKE_XCODE_DEVELOPER_PATH) xcrun --sdk $(EXPORT_QMAKE_MAC_SDK) -show-sdk-version)
++
++ifneq ($(CURRENT_MAC_SDK_VERSION),$(EXPORT_QMAKE_MAC_SDK_VERSION))
++    $(info The platform SDK has been changed from version $(EXPORT_QMAKE_MAC_SDK_VERSION) to version $(CURRENT_MAC_SDK_VERSION).)
++    $(info This requires a fresh build. Please wipe the build directory completely,)
++    $(info including any .qmake.stash and .qmake.cache files generated by qmake.)
++    # FIXME: Ideally this should be advertised as just running make distclean, or we
++    # should even do it automatically by having proper makefile dependencies between
++    # .qmake.stash and the SDK version, but as qmake doesn't seem to be consistent in
++    # how it deals with .qmake.stash as a dependency we need to defer that until later.
++    $(error ^)
++endif
 -- 
-2.19.1
+2.20.1
 

recipe/patches/0015-qtbase-use-better-clang-optimize-size.patch → recipe/patches/0003-qtbase-use-better-clang-optimize-size.patch

@@ -1,7 +1,7 @@
-From 09cf9e15956c6e8565fa8b59cbd118a4af3fb86e Mon Sep 17 00:00:00 2001
+From 5e4faa94158429fa54d1cc02180eb00db0a70ea0 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 10 Dec 2018 14:48:02 -0600
-Subject: [PATCH] qbase: use better clang optimize size
+Subject: [PATCH 3/6] qtbase: use better clang optimize size
 
 Change-Id: I2d0eae04918b9a6306b0684506f3253547233e36
 ---
@@ -21,5 +21,5 @@ index 5800aaa5b4..8e3c6c1817 100644
  QMAKE_CXXFLAGS_PRECOMPILE        = -x c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
  QMAKE_CXXFLAGS_USE_PRECOMPILE    = $$QMAKE_CFLAGS_USE_PRECOMPILE
 -- 
-2.19.1
+2.20.1
 

recipe/patches/0017-qtbase-never-enable-new-dtags.patch → recipe/patches/0004-qtbase-never-enable-new-dtags.patch

@@ -1,7 +1,7 @@
-From 872a2ee6ef1bf9acc2701740c64b778407004905 Mon Sep 17 00:00:00 2001
+From 95a1a184633079dffb20f507dd81ea363df30cac Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 10 Dec 2018 14:49:51 -0600
-Subject: [PATCH] qtbase: never enable new-dtags
+Subject: [PATCH 4/6] qtbase: never enable new-dtags
 
 Change-Id: I2c99367bc60b1d6e84811ab4e186ac0810cd399c
 ---
@@ -10,10 +10,10 @@ Change-Id: I2c99367bc60b1d6e84811ab4e186ac0810cd399c
  2 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/qtbase/configure.json b/qtbase/configure.json
-index 522bd34e9b..3cc1e24603 100644
+index 9fce6d039e..42ad203068 100644
 --- a/qtbase/configure.json
 +++ b/qtbase/configure.json
-@@ -339,7 +339,7 @@
+@@ -353,7 +353,7 @@
          "enable_new_dtags": {
              "label": "new dtags support",
              "type": "linkerSupportsFlag",
@@ -36,5 +36,5 @@ index 700f228c36..3a1e843ea5 100644
  QMAKE_LFLAGS_USE_GOLD   = -fuse-ld=gold
 
 -- 
-2.19.1
+2.20.1
 

recipe/patches/0019-qtbase-link-xcb-shm.patch → recipe/patches/0005-qtbase-link-xcb-shm.patch

@@ -1,27 +1,28 @@
-From 8005d91c1f098c87bf9c1e27a867a802b6e76b0f Mon Sep 17 00:00:00 2001
+From 9fdd217d7bea7fbd55f26ce4a396b1d47de5ab27 Mon Sep 17 00:00:00 2001
 From: Ray Donnelly <mingw.android@gmail.com>
 Date: Mon, 10 Dec 2018 14:51:15 -0600
-Subject: [PATCH] qtbase: link xcb-shm
+Subject: [PATCH 5/6] qtbase: link xcb-shm
 
 Change-Id: I49300967cd92ed280a9a0c685e98a45c633118b6
 ---
- src/gui/configure.json | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/gui/configure.json | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/qtbase/src/gui/configure.json b/qtbase/src/gui/configure.json
-index 0332631ec8..6b027edfc9 100644
+index c51e3ceee3..2b08d84373 100644
 --- a/qtbase/src/gui/configure.json
 +++ b/qtbase/src/gui/configure.json
-@@ -472,7 +472,7 @@
+@@ -586,8 +586,8 @@
              },
+             "headers": "xcb/xcb.h",
              "sources": [
 -                { "type": "pkgConfig", "args": "xcb >= 1.9" },
 -                "-lxcb"
 +                { "type": "pkgConfig", "args": "xcb >= 1.9 xcb-shm >= 1.9" },
 +                "-lxcb -lxcb-shm"
              ]
          },
-         "xcb_syslibs": {
+         "xcb_icccm": {
 -- 
-2.19.1
+2.20.1