JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt512.qtwebengine: update darwin patches

Browse Source
This commit is contained in:
Thomas Tuegel 2021-01-01 07:58:34 -06:00
parent a61f20e418
commit 54fff8407b
No known key found for this signature in database
GPG Key ID: 22CBF5249D4B4D59
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
diff --git a/configure.pri b/configure.pri diff --git a/configure.pri b/configure.pri
index 897bea54..6f834c20 100644 index 897bea540..6f834c202 100644
--- a/configure.pri --- a/configure.pri
+++ b/configure.pri +++ b/configure.pri
@@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) { @@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) {
@ -12,7 +12,7 @@ index 897bea54..6f834c20 100644
} }
diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
index 35eb6b89..7eed640a 100644 index 35eb6b89c..7eed640a5 100644
--- a/mkspecs/features/platform.prf --- a/mkspecs/features/platform.prf
+++ b/mkspecs/features/platform.prf +++ b/mkspecs/features/platform.prf
@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) { @@ -40,8 +40,6 @@ defineTest(isPlatformSupported) {
@ -43,10 +43,10 @@ index 35eb6b89..7eed640a 100644
isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) { isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) {
skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.") skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.")
diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
index 4426901c..3aa6057e 100644 index 7b77a8bf7..0e1284ee4 100644
--- a/src/core/config/mac_osx.pri --- a/src/core/config/mac_osx.pri
+++ b/src/core/config/mac_osx.pri +++ b/src/core/config/mac_osx.pri
@@ -5,16 +5,16 @@ load(functions) @@ -5,7 +5,7 @@ load(functions)
# otherwise query for it. # otherwise query for it.
QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion) QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
isEmpty(QMAKE_MAC_SDK_VERSION) { isEmpty(QMAKE_MAC_SDK_VERSION) {
@ -55,17 +55,15 @@ index 4426901c..3aa6057e 100644
isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'") isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
} }
@@ -14,11 +14,6 @@ isEmpty(QMAKE_MAC_SDK_VERSION) {
QMAKE_MAC_SDK_VERSION_MAJOR_MINOR = $$section(QMAKE_MAC_SDK_VERSION, ".", 0, 1)
QMAKE_CLANG_DIR = "/usr" QMAKE_CLANG_DIR = "/usr"
-QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX) -QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
-!isEmpty(QMAKE_CLANG_PATH) { -!isEmpty(QMAKE_CLANG_PATH) {
- clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../") - clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
- exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir - exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
-} -}
+# QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
+# !isEmpty(QMAKE_CLANG_PATH) {
+# clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
+# exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
+# }
QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++" QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++"
message("Using clang++ from $${QMAKE_CLANG_PATH}") message("Using clang++ from $${QMAKE_CLANG_PATH}")