pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch

   1 diff --git a/configure.pri b/configure.pri
   2 index 897bea540..6f834c202 100644
   3 --- a/configure.pri
   4 +++ b/configure.pri
   5 @@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) {
   6  }
   7
   8  defineReplace(webEngineGetMacOSSDKVersion) {
   9 -    value = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null")
  10 +    value = $$system("xcrun --show-sdk-version")
  11      return($$value)
  12  }
  13
  14 diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
  15 index 35eb6b89c..7eed640a5 100644
  16 --- a/mkspecs/features/platform.prf
  17 +++ b/mkspecs/features/platform.prf
  18 @@ -40,8 +40,6 @@ defineTest(isPlatformSupported) {
  19    } else:osx {
  20      # FIXME: Try to get it back down to 8.2 for building on OS X 10.11
  21      !isMinXcodeVersion(8, 3, 3) {
  22 -      skipBuild("Using Xcode version $$QMAKE_XCODE_VERSION, but at least version 8.3.3 is required to build Qt WebEngine.")
  23 -      return(false)
  24      }
  25      !clang|intel_icc {
  26          skipBuild("Qt WebEngine on macOS requires Clang.")
  27 @@ -54,8 +52,6 @@ defineTest(isPlatformSupported) {
  28        return(false)
  29      }
  30      !isMinOSXSDKVersion(10, 12): {
  31 -      skipBuild("Building Qt WebEngine requires a macOS SDK version of 10.12 or newer. Current version is $${WEBENGINE_OSX_SDK_PRODUCT_VERSION}.")
  32 -      return(false)
  33      }
  34    } else {
  35      skipBuild("Unknown platform. Qt WebEngine only supports Linux, Windows, and macOS.")
  36 @@ -111,7 +107,7 @@ defineTest(isMinOSXSDKVersion) {
  37      requested_minor = $$2
  38      requested_patch = $$3
  39      isEmpty(requested_patch): requested_patch = 0
  40 -    WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("/usr/bin/xcodebuild -sdk $$QMAKE_MAC_SDK -version ProductVersion 2>/dev/null")
  41 +    WEBENGINE_OSX_SDK_PRODUCT_VERSION = $$system("xcrun --show-sdk-version")
  42      export(WEBENGINE_OSX_SDK_PRODUCT_VERSION)
  43      isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) {
  44          skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.")
  45 diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
  46 index 7b77a8bf7..0e1284ee4 100644
  47 --- a/src/core/config/mac_osx.pri
  48 +++ b/src/core/config/mac_osx.pri
  49 @@ -5,7 +5,7 @@ load(functions)
  50  # otherwise query for it.
  51  QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
  52  isEmpty(QMAKE_MAC_SDK_VERSION) {
  53 -     QMAKE_MAC_SDK_VERSION = $$system("/usr/bin/xcodebuild -sdk $${QMAKE_MAC_SDK} -version SDKVersion 2>/dev/null")
  54 +     QMAKE_MAC_SDK_VERSION = $$system("xcrun --show-sdk-version")
  55       isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
  56  }
  57
  58 @@ -14,11 +14,6 @@ isEmpty(QMAKE_MAC_SDK_VERSION) {
  59  QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1)
  60
  61  QMAKE_CLANG_DIR = "/usr"
  62 -QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
  63 -!isEmpty(QMAKE_CLANG_PATH) {
  64 -    clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
  65 -    exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
  66 -}
  67
  68  QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++"
  69  message("Using clang++ from $${QMAKE_CLANG_PATH}")