git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #108115 from ttuegel/qt-5.12-darwin

qt512: fix darwin patches

commit43939ba8a82ce8a2941ca059c1dec5ac68f58d42 authorThomas Tuegel <ttuegel@mailbox.org> dateFri 1 Jan 2021, 14:51 (6 years ago) parent892594554fff84
3 files changed+18−37
compare with master
unifiedsplit
pkgs/development/libraries/qt-5/5.12/default.nix+4−5 pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch+7−23 pkgs/development/libraries/qt-5/5.12/qtwebengine-darwin-no-platform-check.patch+7−9
pkgs/development/libraries/qt-5/5.12/default.nix+4−5
@@ -51,7 +51,7 @@ let
5151
5252 patches = {
5353 qtbase =
54− optionals stdenv.isDarwin [
54+ [
5555 ./qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
5656 ./qtbase.patch.d/0002-qtbase-mac.patch
5757 ./qtbase.patch.d/0013-define-kiosurfacesuccess.patch
@@ -59,8 +59,7 @@ let
5959 # Patch framework detection to support X.framework/X.tbd,
6060 # extending the current support for X.framework/X.
6161 ./qtbase.patch.d/0015-qtbase-tbd-frameworks.patch
62− ]
63− ++ [
62+
6463 ./qtbase.patch.d/0003-qtbase-mkspecs.patch
6564 ./qtbase.patch.d/0004-qtbase-replace-libdir.patch
6665 ./qtbase.patch.d/0005-qtbase-cmake.patch
@@ -97,7 +96,7 @@ let
9796 stripLen = 1;
9897 extraPrefix = "src/3rdparty/";
9998 })
100− ] ++ optionals stdenv.isDarwin [
99+
101100 ./qtwebengine-darwin-no-platform-check.patch
102101 ./qtwebengine-darwin-fix-failed-static-assertion.patch
103102 ];
@@ -108,7 +107,7 @@ let
108107 sha256 = "0h8ymfnwgkjkwaankr3iifiscsvngqpwb91yygndx344qdiw9y0n";
109108 })
110109 ./qtwebkit.patch
111− ] ++ optionals stdenv.isDarwin [
110+
112111 ./qtwebkit-darwin-no-readline.patch
113112 ./qtwebkit-darwin-no-qos-classes.patch
114113 ];
pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch+7−23
@@ -1,18 +1,5 @@
1−From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
2−From: Thomas Tuegel <ttuegel@mailbox.org>
3−Date: Tue, 17 Sep 2019 05:34:00 -0500
4−Subject: [PATCH 01/12] qtbase-mkspecs-mac
5−
6−---
7− mkspecs/common/mac.conf | 2 +-
8− mkspecs/features/mac/default_post.prf | 202 ----------------------------------
9− mkspecs/features/mac/default_pre.prf | 58 ----------
10− mkspecs/features/mac/sdk.mk | 25 -----
11− mkspecs/features/mac/sdk.prf | 61 ----------
12− 5 files changed, 1 insertion(+), 347 deletions(-)
13−
141diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
15−index b77494ec9b..470c38e772 100644
2+index b77494ec..470c38e7 100644
163--- a/mkspecs/common/mac.conf
174+++ b/mkspecs/common/mac.conf
185@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
@@ -25,7 +12,7 @@ index b77494ec9b..470c38e772 100644
2512
2613 QMAKE_LFLAGS_REL_RPATH =
2714diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
28−index 993f4d56a9..b80ec1e801 100644
15+index d052808c..b80ec1e8 100644
2916--- a/mkspecs/features/mac/default_post.prf
3017+++ b/mkspecs/features/mac/default_post.prf
3118@@ -68,208 +68,6 @@ qt {
@@ -161,7 +148,7 @@ index 993f4d56a9..b80ec1e801 100644
161148- -isysroot$$xcodeSDKInfo(Path, $$sdk)
162149- QMAKE_XARCH_LFLAGS_$${arch} = $$version_min_flags \
163150- -Xarch_$${arch} \
164−- -Wl,-syslibroot,$$xcodeSDKInfo(Path, $$sdk)
151+- -isysroot$$xcodeSDKInfo(Path, $$sdk)
165152-
166153- QMAKE_XARCH_CFLAGS += $(EXPORT_QMAKE_XARCH_CFLAGS_$${arch})
167154- QMAKE_XARCH_LFLAGS += $(EXPORT_QMAKE_XARCH_LFLAGS_$${arch})
@@ -182,7 +169,7 @@ index 993f4d56a9..b80ec1e801 100644
182169- version_min_flag = -m$${version_identifier}-version-min=$$deployment_target
183170- QMAKE_CFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
184171- QMAKE_CXXFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
185−- QMAKE_LFLAGS += -Wl,-syslibroot,$$QMAKE_MAC_SDK_PATH $$version_min_flag
172+- QMAKE_LFLAGS += -isysroot $$QMAKE_MAC_SDK_PATH $$version_min_flag
186173- }
187174-
188175- # Enable precompiled headers for multiple architectures
@@ -238,7 +225,7 @@ index 993f4d56a9..b80ec1e801 100644
238225 generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
239226 generate_xcode_project.target = xcodeproj
240227diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
241−index e3534561a5..3b01424e67 100644
228+index e3534561..3b01424e 100644
242229--- a/mkspecs/features/mac/default_pre.prf
243230+++ b/mkspecs/features/mac/default_pre.prf
244231@@ -1,60 +1,2 @@
@@ -303,7 +290,7 @@ index e3534561a5..3b01424e67 100644
303290-xcode_copy_phase_strip_setting.value = NO
304291-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
305292diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
306−index c40f58c987..e69de29bb2 100644
293+index c40f58c9..e69de29b 100644
307294--- a/mkspecs/features/mac/sdk.mk
308295+++ b/mkspecs/features/mac/sdk.mk
309296@@ -1,25 +0,0 @@
@@ -333,7 +320,7 @@ index c40f58c987..e69de29bb2 100644
333320- endif
334321-endif
335322diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
336−index 3a9c2778bb..e69de29bb2 100644
323+index 3a9c2778..e69de29b 100644
337324--- a/mkspecs/features/mac/sdk.prf
338325+++ b/mkspecs/features/mac/sdk.prf
339326@@ -1,61 +0,0 @@
@@ -398,6 +385,3 @@ index 3a9c2778bb..e69de29bb2 100644
398385- $$tool = $$sysrooted $$member(value, 1, -1)
399386- cache($$tool_variable, set stash, $$tool)
400387-}
401−--
402−2.23.GIT
403−
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}")