Skip to content

Commit 70afa65

Browse files
ken2812221TheCharlatan
authored andcommitted
Fix depends Qt5.9.4 mac build
Apply patch from QTBUG-67286
1 parent 28482ef commit 70afa65

File tree

3 files changed

+71
-0
lines changed

3 files changed

+71
-0
lines changed

depends/packages/qt.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ $(package)_config_opts_linux += -fontconfig
9191
$(package)_config_opts_linux += -no-opengl
9292
$(package)_config_opts_arm_linux = -platform linux-g++ -xplatform $(host)
9393
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
94+
$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
9495
$(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
9596
$(package)_build_env = QT_RCC_TEST=1
9697
endef
@@ -128,6 +129,7 @@ define $(package)_preprocess_cmds
128129
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
129130
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
130131
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
132+
patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
131133
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
132134
patch -p1 -i $($(package)_patch_dir)/qfixed-coretext.patch &&\
133135
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
--- old/qtbase/mkspecs/features/mac/sdk.prf 2018-02-08 10:24:48.000000000 -0800
2+
+++ new/qtbase/mkspecs/features/mac/sdk.prf 2018-03-23 10:38:56.000000000 -0700
3+
@@ -8,21 +8,21 @@
4+
defineReplace(xcodeSDKInfo) {
5+
info = $$1
6+
equals(info, "Path"): \
7+
- info = --show-sdk-path
8+
+ infoarg = --show-sdk-path
9+
equals(info, "PlatformPath"): \
10+
- info = --show-sdk-platform-path
11+
+ infoarg = --show-sdk-platform-path
12+
equals(info, "SDKVersion"): \
13+
- info = --show-sdk-version
14+
+ infoarg = --show-sdk-version
15+
sdk = $$2
16+
isEmpty(sdk): \
17+
sdk = $$QMAKE_MAC_SDK
18+
19+
isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
20+
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
21+
+ QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
22+
# --show-sdk-platform-path won't work for Command Line Tools; this is fine
23+
# only used by the XCTest backend to testlib
24+
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
25+
- error("Could not resolve SDK $$info for \'$$sdk\'")
26+
+ isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
27+
+ error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
28+
cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
29+
}
30+
31+
--- old/qtbase/configure 2018-02-08 10:24:48.000000000 -0800
32+
+++ new/qtbase/configure 2018-03-23 05:42:29.000000000 -0700
33+
@@ -232,8 +232,13 @@
34+
35+
sdk=$(getSingleQMakeVariable "QMAKE_MAC_SDK" "$1")
36+
if [ -z "$sdk" ]; then echo "QMAKE_MAC_SDK must be set when building on Mac" >&2; exit 1; fi
37+
- sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)
38+
- if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi
39+
+ sysroot=$(getSingleQMakeVariable "QMAKE_MAC_SDK_PATH" "$1")
40+
+
41+
+ echo "sysroot pre-configured as $sysroot";
42+
+ if [ -z "$sysroot" ]; then
43+
+ sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)
44+
+ if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi
45+
+ fi
46+
47+
case "$sdk" in
48+
macosx*)
49+
50+
Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
--- x/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
2+
+++ y/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
3+
@@ -52,6 +52,7 @@
4+
//
5+
6+
#include <QtCore/qglobal.h>
7+
+#include <qpa/qplatformprintdevice.h>
8+
9+
#ifndef QT_NO_PRINTER
10+
11+
--- x/qtbase/src/plugins/plugins.pro
12+
+++ y/qtbase/src/plugins/plugins.pro
13+
@@ -8,6 +8,3 @@ qtHaveModule(gui) {
14+
qtConfig(imageformatplugin): SUBDIRS *= imageformats
15+
!android:qtConfig(library): SUBDIRS *= generic
16+
}
17+
-
18+
-!winrt:qtHaveModule(printsupport): \
19+
- SUBDIRS += printsupport

0 commit comments

Comments
 (0)