mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-04-29 23:09:44 -04:00
Fix depends Qt5.9.4 mac build
Apply patch from QTBUG-67286
This commit is contained in:
parent
28482efefb
commit
70afa65b17
3 changed files with 71 additions and 0 deletions
|
@ -91,6 +91,7 @@ $(package)_config_opts_linux += -fontconfig
|
||||||
$(package)_config_opts_linux += -no-opengl
|
$(package)_config_opts_linux += -no-opengl
|
||||||
$(package)_config_opts_arm_linux = -platform linux-g++ -xplatform $(host)
|
$(package)_config_opts_arm_linux = -platform linux-g++ -xplatform $(host)
|
||||||
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
|
$(package)_config_opts_i686_linux = -xplatform linux-g++-32
|
||||||
|
$(package)_config_opts_x86_64_linux = -xplatform linux-g++-64
|
||||||
$(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
|
$(package)_config_opts_mingw32 = -no-opengl -xplatform win32-g++ -device-option CROSS_COMPILE="$(host)-"
|
||||||
$(package)_build_env = QT_RCC_TEST=1
|
$(package)_build_env = QT_RCC_TEST=1
|
||||||
endef
|
endef
|
||||||
|
@ -128,6 +129,7 @@ define $(package)_preprocess_cmds
|
||||||
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
|
cp -f qtbase/mkspecs/macx-clang/qplatformdefs.h qtbase/mkspecs/macx-clang-linux/ &&\
|
||||||
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
|
cp -f $($(package)_patch_dir)/mac-qmake.conf qtbase/mkspecs/macx-clang-linux/qmake.conf && \
|
||||||
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
|
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
|
||||||
|
patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
|
||||||
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
|
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
|
||||||
patch -p1 -i $($(package)_patch_dir)/qfixed-coretext.patch &&\
|
patch -p1 -i $($(package)_patch_dir)/qfixed-coretext.patch &&\
|
||||||
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
|
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
|
||||||
|
|
50
depends/patches/qt/fix_configure_mac.patch
Normal file
50
depends/patches/qt/fix_configure_mac.patch
Normal file
|
@ -0,0 +1,50 @@
|
||||||
|
--- old/qtbase/mkspecs/features/mac/sdk.prf 2018-02-08 10:24:48.000000000 -0800
|
||||||
|
+++ new/qtbase/mkspecs/features/mac/sdk.prf 2018-03-23 10:38:56.000000000 -0700
|
||||||
|
@@ -8,21 +8,21 @@
|
||||||
|
defineReplace(xcodeSDKInfo) {
|
||||||
|
info = $$1
|
||||||
|
equals(info, "Path"): \
|
||||||
|
- info = --show-sdk-path
|
||||||
|
+ infoarg = --show-sdk-path
|
||||||
|
equals(info, "PlatformPath"): \
|
||||||
|
- info = --show-sdk-platform-path
|
||||||
|
+ infoarg = --show-sdk-platform-path
|
||||||
|
equals(info, "SDKVersion"): \
|
||||||
|
- info = --show-sdk-version
|
||||||
|
+ infoarg = --show-sdk-version
|
||||||
|
sdk = $$2
|
||||||
|
isEmpty(sdk): \
|
||||||
|
sdk = $$QMAKE_MAC_SDK
|
||||||
|
|
||||||
|
isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}) {
|
||||||
|
- QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$info 2>/dev/null")
|
||||||
|
+ QMAKE_MAC_SDK.$${sdk}.$${info} = $$system("/usr/bin/xcrun --sdk $$sdk $$infoarg 2>/dev/null")
|
||||||
|
# --show-sdk-platform-path won't work for Command Line Tools; this is fine
|
||||||
|
# only used by the XCTest backend to testlib
|
||||||
|
- isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(info, "--show-sdk-platform-path")): \
|
||||||
|
- error("Could not resolve SDK $$info for \'$$sdk\'")
|
||||||
|
+ isEmpty(QMAKE_MAC_SDK.$${sdk}.$${info}):if(!isEmpty(QMAKE_XCODEBUILD_PATH)|!equals(infoarg, "--show-sdk-platform-path")): \
|
||||||
|
+ error("Could not resolve SDK $$info for \'$$sdk\' using $$infoarg")
|
||||||
|
cache(QMAKE_MAC_SDK.$${sdk}.$${info}, set stash, QMAKE_MAC_SDK.$${sdk}.$${info})
|
||||||
|
}
|
||||||
|
|
||||||
|
--- old/qtbase/configure 2018-02-08 10:24:48.000000000 -0800
|
||||||
|
+++ new/qtbase/configure 2018-03-23 05:42:29.000000000 -0700
|
||||||
|
@@ -232,8 +232,13 @@
|
||||||
|
|
||||||
|
sdk=$(getSingleQMakeVariable "QMAKE_MAC_SDK" "$1")
|
||||||
|
if [ -z "$sdk" ]; then echo "QMAKE_MAC_SDK must be set when building on Mac" >&2; exit 1; fi
|
||||||
|
- sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)
|
||||||
|
- if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi
|
||||||
|
+ sysroot=$(getSingleQMakeVariable "QMAKE_MAC_SDK_PATH" "$1")
|
||||||
|
+
|
||||||
|
+ echo "sysroot pre-configured as $sysroot";
|
||||||
|
+ if [ -z "$sysroot" ]; then
|
||||||
|
+ sysroot=$(/usr/bin/xcrun --sdk $sdk --show-sdk-path 2>/dev/null)
|
||||||
|
+ if [ -z "$sysroot" ]; then echo "Failed to resolve SDK path for '$sdk'" >&2; exit 1; fi
|
||||||
|
+ fi
|
||||||
|
|
||||||
|
case "$sdk" in
|
||||||
|
macosx*)
|
||||||
|
|
||||||
|
|
19
depends/patches/qt/fix_no_printer.patch
Normal file
19
depends/patches/qt/fix_no_printer.patch
Normal file
|
@ -0,0 +1,19 @@
|
||||||
|
--- x/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
|
||||||
|
+++ y/qtbase/src/plugins/platforms/cocoa/qprintengine_mac_p.h
|
||||||
|
@@ -52,6 +52,7 @@
|
||||||
|
//
|
||||||
|
|
||||||
|
#include <QtCore/qglobal.h>
|
||||||
|
+#include <qpa/qplatformprintdevice.h>
|
||||||
|
|
||||||
|
#ifndef QT_NO_PRINTER
|
||||||
|
|
||||||
|
--- x/qtbase/src/plugins/plugins.pro
|
||||||
|
+++ y/qtbase/src/plugins/plugins.pro
|
||||||
|
@@ -8,6 +8,3 @@ qtHaveModule(gui) {
|
||||||
|
qtConfig(imageformatplugin): SUBDIRS *= imageformats
|
||||||
|
!android:qtConfig(library): SUBDIRS *= generic
|
||||||
|
}
|
||||||
|
-
|
||||||
|
-!winrt:qtHaveModule(printsupport): \
|
||||||
|
- SUBDIRS += printsupport
|
Loading…
Add table
Reference in a new issue