git.iko.soy/typeable/nixpkgs
on master help sign in
qt512.qtwebengine: update darwin patches
commit54fff8407bd5569f606bca2a32992622a374e7ba authorThomas Tuegel <ttuegel@mailbox.org> dateFri 1 Jan 2021, 07:58 (6 years ago) parenta61f20e
1 file changed+7−9
pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch+7−9
pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch+7−9
@@ -1,5 +1,5 @@
11diff --git a/configure.pri b/configure.pri
2−index 897bea54..6f834c20 100644
2+index 897bea540..6f834c202 100644
33--- a/configure.pri
44+++ b/configure.pri
55@@ -269,7 +269,7 @@ defineReplace(webEngineGetMacOSVersion) {
@@ -12,7 +12,7 @@ index 897bea54..6f834c20 100644
1212 }
1313
1414diff --git a/mkspecs/features/platform.prf b/mkspecs/features/platform.prf
15−index 35eb6b89..7eed640a 100644
15+index 35eb6b89c..7eed640a5 100644
1616--- a/mkspecs/features/platform.prf
1717+++ b/mkspecs/features/platform.prf
1818@@ -40,8 +40,6 @@ defineTest(isPlatformSupported) {
@@ -43,10 +43,10 @@ index 35eb6b89..7eed640a 100644
4343 isEmpty(WEBENGINE_OSX_SDK_PRODUCT_VERSION) {
4444 skipBuild("Could not resolve SDK product version for \'$$QMAKE_MAC_SDK\'.")
4545diff --git a/src/core/config/mac_osx.pri b/src/core/config/mac_osx.pri
46−index 4426901c..3aa6057e 100644
46+index 7b77a8bf7..0e1284ee4 100644
4747--- a/src/core/config/mac_osx.pri
4848+++ b/src/core/config/mac_osx.pri
49−@@ -5,16 +5,16 @@ load(functions)
49+@@ -5,7 +5,7 @@ load(functions)
5050 # otherwise query for it.
5151 QMAKE_MAC_SDK_VERSION = $$eval(QMAKE_MAC_SDK.$${QMAKE_MAC_SDK}.SDKVersion)
5252 isEmpty(QMAKE_MAC_SDK_VERSION) {
@@ -55,17 +55,15 @@ index 4426901c..3aa6057e 100644
5555 isEmpty(QMAKE_MAC_SDK_VERSION): error("Could not resolve SDK version for \'$${QMAKE_MAC_SDK}\'")
5656 }
5757
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+
5861 QMAKE_CLANG_DIR = "/usr"
5962-QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
6063-!isEmpty(QMAKE_CLANG_PATH) {
6164- clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
6265- exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
6366-}
64−+# QMAKE_CLANG_PATH = $$eval(QMAKE_MAC_SDK.macx-clang.$${QMAKE_MAC_SDK}.QMAKE_CXX)
65−+# !isEmpty(QMAKE_CLANG_PATH) {
66−+# clang_dir = $$clean_path("$$dirname(QMAKE_CLANG_PATH)/../")
67−+# exists($$clang_dir): QMAKE_CLANG_DIR = $$clang_dir
68−+# }
6967
7068 QMAKE_CLANG_PATH = "$${QMAKE_CLANG_DIR}/bin/clang++"
7169 message("Using clang++ from $${QMAKE_CLANG_PATH}")