Skip to content

Commit a881378

Browse files
jamescowensjamescowens
authored
Merge pull request #2486 from barton2526/qt2
build: Qt 5.15.2
2 parents 3de763d + fa43e3e commit a881378

21 files changed

+461
-273
lines changed

‎build-aux/m4/bitcoin_qt.m4

+6-5
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,11 @@ AC_DEFUN([BITCOIN_QT_INIT],[
6767
AS_IF([test "$with_gui" = "qt5_debug"],
6868
[AS_CASE([$host],
6969
[*darwin*], [qt_lib_suffix=_debug],
70-
[*mingw*], [qt_lib_suffix=d],
7170
[qt_lib_suffix= ]); bitcoin_qt_want_version=qt5],
7271
[qt_lib_suffix= ])
7372
73+
AS_CASE([$host], [*android*], [qt_lib_suffix=_$ANDROID_ARCH])
74+
7475
AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], [])
7576
AC_ARG_WITH([qt-libdir],[AS_HELP_STRING([--with-qt-libdir=LIB_DIR],[specify qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], [])
7677
AC_ARG_WITH([qt-plugindir],[AS_HELP_STRING([--with-qt-plugindir=PLUGIN_DIR],[specify qt plugin path (overridden by pkgconfig)])], [qt_plugin_path=$withval], [])
@@ -155,8 +156,6 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
155156
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsIntegrationPlugin], [-lqwindows])
156157
AC_DEFINE(QT_QPA_PLATFORM_WINDOWS, 1, [Define this symbol if the qt platform is windows])
157158
elif test "$TARGET_OS" = "linux"; then
158-
dnl workaround for https://bugreports.qt.io/browse/QTBUG-74874
159-
AX_CHECK_LINK_FLAG([-lxcb-shm], [QT_LIBS="-lxcb-shm $QT_LIBS"], [AC_MSG_ERROR([could not link against -lxcb-shm])])
160159
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb])
161160
AC_DEFINE(QT_QPA_PLATFORM_XCB, 1, [Define this symbol if the qt platform is xcb])
162161
elif test "$TARGET_OS" = "darwin"; then
@@ -168,7 +167,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
168167
_BITCOIN_QT_CHECK_STATIC_PLUGIN([QMacStylePlugin], [-lqmacstyle])
169168
AC_DEFINE(QT_QPA_PLATFORM_COCOA, 1, [Define this symbol if the qt platform is cocoa])
170169
elif test "$TARGET_OS" = "android"; then
171-
QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lqtforandroid -ljnigraphics -landroid -lqtfreetype $QT_LIBS"
170+
QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lplugins_platforms_qtforandroid${qt_lib_suffix} -ljnigraphics -landroid -lqtfreetype${qt_lib_suffix} $QT_LIBS"
172171
AC_DEFINE(QT_QPA_PLATFORM_ANDROID, 1, [Define this symbol if the qt platform is android])
173172
fi
174173
dnl Gridcoin uses SVG:
@@ -398,14 +397,16 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_LIBS], [
398397
PKG_CHECK_MODULES([QT_INPUT], [${qt_lib_prefix}InputSupport], [QT_LIBS="$QT_INPUT_LIBS $QT_LIBS"])
399398
PKG_CHECK_MODULES([QT_SERVICE], [${qt_lib_prefix}ServiceSupport], [QT_LIBS="$QT_SERVICE_LIBS $QT_LIBS"])
400399
PKG_CHECK_MODULES([QT_XCBQPA], [${qt_lib_prefix}XcbQpa], [QT_LIBS="$QT_XCBQPA_LIBS $QT_LIBS"])
400+
PKG_CHECK_MODULES([QT_XKBCOMMON], [${qt_lib_prefix}XkbCommonSupport], [QT_LIBS="$QT_XKBCOMMON_LIBS $QT_LIBS"])
401401
elif test "$TARGET_OS" = "darwin"; then
402402
PKG_CHECK_MODULES([QT_CLIPBOARD], [${qt_lib_prefix}ClipboardSupport${qt_lib_suffix}], [QT_LIBS="$QT_CLIPBOARD_LIBS $QT_LIBS"])
403403
PKG_CHECK_MODULES([QT_GRAPHICS], [${qt_lib_prefix}GraphicsSupport${qt_lib_suffix}], [QT_LIBS="$QT_GRAPHICS_LIBS $QT_LIBS"])
404404
PKG_CHECK_MODULES([QT_SERVICE], [${qt_lib_prefix}ServiceSupport${qt_lib_suffix}], [QT_LIBS="$QT_SERVICE_LIBS $QT_LIBS"])
405405
elif test "$TARGET_OS" = "windows"; then
406406
PKG_CHECK_MODULES([QT_WINDOWSUIAUTOMATION], [${qt_lib_prefix}WindowsUIAutomationSupport${qt_lib_suffix}], [QT_LIBS="$QT_WINDOWSUIAUTOMATION_LIBS $QT_LIBS"])
407407
elif test "$TARGET_OS" = "android"; then
408-
PKG_CHECK_MODULES([QT_EGL], [${qt_lib_prefix}EglSupport], [QT_LIBS="$QT_EGL_LIBS $QT_LIBS"])
408+
PKG_CHECK_MODULES([QT_EGL], [${qt_lib_prefix}EglSupport${qt_lib_suffix}], [QT_LIBS="$QT_EGL_LIBS $QT_LIBS"])
409+
PKG_CHECK_MODULES([QT_SERVICE], [${qt_lib_prefix}ServiceSupport${qt_lib_suffix}], [QT_LIBS="$QT_SERVICE_LIBS $QT_LIBS"])
409410
fi
410411
])
411412

‎contrib/devtools/symbol-check.py

+14-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,19 @@
7575
'libxcb.so.1', # part of X11
7676
'libfontconfig.so.1', # font support
7777
'libfreetype.so.6', # font parsing
78-
'libdl.so.2' # programming interface to dynamic linker
78+
'libdl.so.2', # programming interface to dynamic linker
79+
'libxcb-icccm.so.4',
80+
'libxcb-image.so.0',
81+
'libxcb-shm.so.0',
82+
'libxcb-keysyms.so.1',
83+
'libxcb-randr.so.0',
84+
'libxcb-render-util.so.0',
85+
'libxcb-render.so.0',
86+
'libxcb-shape.so.0',
87+
'libxcb-sync.so.1',
88+
'libxcb-xfixes.so.0',
89+
'libxcb-xinerama.so.0',
90+
'libxcb-xkb.so.1'
7991
}
8092
ARCH_MIN_GLIBC_VER = {
8193
'80386': (2,1),
@@ -93,6 +105,7 @@
93105
'AppKit', # user interface
94106
'ApplicationServices', # common application tasks.
95107
'Carbon', # deprecated c back-compat API
108+
'ColorSync',
96109
'CoreFoundation', # low level func, data types
97110
'CoreGraphics', # 2D rendering
98111
'CoreServices', # operating system services

‎depends/packages/libxcb_util.mk

+32
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package=libxcb_util
2+
$(package)_version=0.4.0
3+
$(package)_download_path=https://xcb.freedesktop.org/dist
4+
$(package)_file_name=xcb-util-$($(package)_version).tar.bz2
5+
$(package)_sha256_hash=46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9
6+
$(package)_dependencies=libxcb
7+
8+
define $(package)_set_vars
9+
$(package)_config_opts = --disable-shared --disable-devel-docs --without-doxygen
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
11+
$(package)_config_opts += --with-pic
12+
endef
13+
14+
define $(package)_preprocess_cmds
15+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
16+
endef
17+
18+
define $(package)_config_cmds
19+
$($(package)_autoconf)
20+
endef
21+
22+
define $(package)_build_cmds
23+
$(MAKE)
24+
endef
25+
26+
define $(package)_stage_cmds
27+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
28+
endef
29+
30+
define $(package)_postprocess_cmds
31+
rm -rf share/man share/doc lib/*.la
32+
endef

‎depends/packages/libxcb_util_image.mk

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package=libxcb_util_image
2+
$(package)_version=0.4.0
3+
$(package)_download_path=https://xcb.freedesktop.org/dist
4+
$(package)_file_name=xcb-util-image-$($(package)_version).tar.bz2
5+
$(package)_sha256_hash=2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc
6+
$(package)_dependencies=libxcb libxcb_util
7+
8+
define $(package)_set_vars
9+
$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
10+
$(package)_config_opts+= --disable-dependency-tracking --enable-option-checking
11+
endef
12+
13+
define $(package)_preprocess_cmds
14+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
15+
endef
16+
17+
define $(package)_config_cmds
18+
$($(package)_autoconf)
19+
endef
20+
21+
define $(package)_build_cmds
22+
$(MAKE)
23+
endef
24+
25+
define $(package)_stage_cmds
26+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
27+
endef
28+
29+
define $(package)_postprocess_cmds
30+
rm -rf share/man share/doc lib/*.la
31+
endef

‎depends/packages/libxcb_util_keysyms.mk

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package=libxcb_util_keysyms
2+
$(package)_version=0.4.0
3+
$(package)_download_path=https://xcb.freedesktop.org/dist
4+
$(package)_file_name=xcb-util-keysyms-$($(package)_version).tar.bz2
5+
$(package)_sha256_hash=0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9
6+
$(package)_dependencies=libxcb xproto
7+
8+
define $(package)_set_vars
9+
$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
11+
endef
12+
13+
define $(package)_preprocess_cmds
14+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
15+
endef
16+
17+
define $(package)_config_cmds
18+
$($(package)_autoconf)
19+
endef
20+
21+
define $(package)_build_cmds
22+
$(MAKE)
23+
endef
24+
25+
define $(package)_stage_cmds
26+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
27+
endef
28+
29+
define $(package)_postprocess_cmds
30+
rm -rf share/man share/doc lib/*.la
31+
endef

‎depends/packages/libxcb_util_render.mk

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package=libxcb_util_render
2+
$(package)_version=0.3.9
3+
$(package)_download_path=https://xcb.freedesktop.org/dist
4+
$(package)_file_name=xcb-util-renderutil-$($(package)_version).tar.bz2
5+
$(package)_sha256_hash=c6e97e48fb1286d6394dddb1c1732f00227c70bd1bedb7d1acabefdd340bea5b
6+
$(package)_dependencies=libxcb
7+
8+
define $(package)_set_vars
9+
$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
11+
endef
12+
13+
define $(package)_preprocess_cmds
14+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
15+
endef
16+
17+
define $(package)_config_cmds
18+
$($(package)_autoconf)
19+
endef
20+
21+
define $(package)_build_cmds
22+
$(MAKE)
23+
endef
24+
25+
define $(package)_stage_cmds
26+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
27+
endef
28+
29+
define $(package)_postprocess_cmds
30+
rm -rf share/man share/doc lib/*.la
31+
endef

‎depends/packages/libxcb_util_wm.mk

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package=libxcb_util_wm
2+
$(package)_version=0.4.1
3+
$(package)_download_path=https://xcb.freedesktop.org/dist
4+
$(package)_file_name=xcb-util-wm-$($(package)_version).tar.bz2
5+
$(package)_sha256_hash=28bf8179640eaa89276d2b0f1ce4285103d136be6c98262b6151aaee1d3c2a3f
6+
$(package)_dependencies=libxcb
7+
8+
define $(package)_set_vars
9+
$(package)_config_opts=--disable-static --disable-devel-docs --without-doxygen
10+
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
11+
endef
12+
13+
define $(package)_preprocess_cmds
14+
cp -f $(BASEDIR)/config.guess $(BASEDIR)/config.sub .
15+
endef
16+
17+
define $(package)_config_cmds
18+
$($(package)_autoconf)
19+
endef
20+
21+
define $(package)_build_cmds
22+
$(MAKE)
23+
endef
24+
25+
define $(package)_stage_cmds
26+
$(MAKE) DESTDIR=$($(package)_staging_dir) install
27+
endef
28+
29+
define $(package)_postprocess_cmds
30+
rm -rf share/man share/doc lib/*.la
31+
endef

‎depends/packages/packages.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ native_packages := native_ccache
33

44
qt_packages = qrencode
55

6-
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon
6+
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
77
qt_darwin_packages=qt
88
qt_mingw32_packages=qt
99

‎depends/packages/qt.mk

+27-22
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
PACKAGE=qt
2-
$(package)_version=5.12.11
3-
$(package)_download_path=https://download.qt.io/official_releases/qt/5.12/$($(package)_version)/submodules
1+
package=qt
2+
$(package)_version=5.15.2
3+
$(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(package)_version)/submodules
44
$(package)_suffix=everywhere-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=1c1b4e33137ca77881074c140d54c3c9747e845a31338cfe8680f171f0bc3a39
7-
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon
6+
$(package)_sha256_hash=909fad2591ee367993a75d7e2ea50ad4db332f05e1c38dd7a5a274e156a4e0f8
7+
$(package)_linux_dependencies=freetype fontconfig libxcb libxkbcommon libxcb_util libxcb_util_render libxcb_util_keysyms libxcb_util_image libxcb_util_wm
88
$(package)_qt_libs=corelib network widgets gui plugins testlib concurrent
99
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_no_printer.patch no-xlib.patch
10-
$(package)_patches+= fix_android_qmake_conf.patch fix_android_jni_static.patch dont_hardcode_pwd.patch
11-
$(package)_patches+= drop_lrelease_dependency.patch no_sdk_version_check.patch
12-
$(package)_patches+= fix_lib_paths.patch fix_android_pch.patch
13-
$(package)_patches+= qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch subdirs.pro
14-
$(package)_patches+= fix_montery_include.patch
10+
$(package)_patches += dont_hardcode_x86_64.patch fix_montery_include.patch
11+
$(package)_patches += fix_android_jni_static.patch dont_hardcode_pwd.patch
12+
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch fix_limits_header.patch
13+
$(package)_patches += fix_bigsur_style.patch no_qrhi.patch drop_lrelease_dependency.patch subdirs.pro
1514

1615
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
17-
$(package)_qttranslations_sha256_hash=577b0668a777eb2b451c61e8d026d79285371597ce9df06b6dee6c814164b7c3
16+
$(package)_qttranslations_sha256_hash=d5788e86257b21d5323f1efd94376a213e091d1e5e03b45a95dd052b5f570db8
1817

1918
$(package)_qttools_file_name=qttools-$($(package)_suffix)
20-
$(package)_qttools_sha256_hash=98b2aaca230458f65996f3534fd471d2ffd038dd58ac997c0589c06dc2385b4f
19+
$(package)_qttools_sha256_hash=c189d0ce1ff7c739db9a3ace52ac3e24cb8fd6dbf234e49f075249b38f43c1cc
2120

2221
# Gridcoin displays SVG images in the GUI:
2322
$(package)_qtsvg_file_name=qtsvg-$($(package)_suffix)
24-
$(package)_qtsvg_sha256_hash=7a6857a2f68cfbebb9f791396b401a98e951c9bff9bfeb1b5b01914c3ea1a0ed
23+
$(package)_qtsvg_sha256_hash=8bc3c2c1bc2671e9c67d4205589a8309b57903721ad14c60ea21a5d06acb585e
2524

2625
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2726
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -33,14 +32,14 @@ $(package)_config_opts_release += -silent
3332
$(package)_config_opts_debug = -debug
3433
$(package)_config_opts_debug += -optimized-tools
3534
$(package)_config_opts += -bindir $(build_prefix)/bin
36-
$(package)_config_opts += -c++std c++1z
35+
$(package)_config_opts += -c++std c++17
3736
$(package)_config_opts += -confirm-license
3837
$(package)_config_opts += -hostprefix $(build_prefix)
3938
$(package)_config_opts += -no-compile-examples
4039
$(package)_config_opts += -no-cups
4140
$(package)_config_opts += -no-egl
4241
$(package)_config_opts += -no-eglfs
43-
$(package)_config_opts += -no-freetype
42+
$(package)_config_opts += -no-evdev
4443
$(package)_config_opts += -no-gif
4544
$(package)_config_opts += -no-glib
4645
$(package)_config_opts += -no-icu
@@ -55,6 +54,7 @@ $(package)_config_opts += -no-mtdev
5554
$(package)_config_opts += -no-openssl
5655
$(package)_config_opts += -no-openvg
5756
$(package)_config_opts += -no-reduce-relocations
57+
$(package)_config_opts += -no-schannel
5858
$(package)_config_opts += -no-sctp
5959
$(package)_config_opts += -no-securetransport
6060
$(package)_config_opts += -no-sql-db2
@@ -68,6 +68,7 @@ $(package)_config_opts += -no-sql-sqlite
6868
$(package)_config_opts += -no-sql-sqlite2
6969
$(package)_config_opts += -no-system-proxies
7070
$(package)_config_opts += -no-use-gold-linker
71+
$(package)_config_opts += -no-zstd
7172
$(package)_config_opts += -nomake examples
7273
$(package)_config_opts += -nomake tests
7374
$(package)_config_opts += -opensource
@@ -105,6 +106,7 @@ $(package)_config_opts += -no-feature-sqlmodel
105106
$(package)_config_opts += -no-feature-statemachine
106107
$(package)_config_opts += -no-feature-syntaxhighlighter
107108
$(package)_config_opts += -no-feature-textbrowser
109+
$(package)_config_opts += -no-feature-textmarkdownwriter
108110
$(package)_config_opts += -no-feature-textodfwriter
109111
$(package)_config_opts += -no-feature-topleveldomain
110112
# Gridcoin uses QUdpSocket for the diagnostics dialog:
@@ -122,6 +124,7 @@ $(package)_config_opts_darwin = -no-dbus
122124
$(package)_config_opts_darwin += -no-opengl
123125
$(package)_config_opts_darwin += -pch
124126
$(package)_config_opts_darwin += -no-feature-corewlan
127+
$(package)_config_opts_darwin += -no-freetype
125128
$(package)_config_opts_darwin += -device-option QMAKE_MACOSX_DEPLOYMENT_TARGET=$(OSX_MIN_VERSION)
126129

127130
ifneq ($(build_os),darwin)
@@ -134,10 +137,12 @@ $(package)_config_opts_darwin += -device-option MAC_TARGET=$(host)
134137
$(package)_config_opts_darwin += -device-option XCODE_VERSION=$(XCODE_VERSION)
135138
endif
136139

137-
# for macOS on Apple Silicon (ARM) see https://bugreports.qt.io/browse/QTBUG-85279
140+
ifneq ($(build_arch),$(host_arch))
138141
$(package)_config_opts_aarch64_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=arm64
142+
$(package)_config_opts_x86_64_darwin += -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64
143+
endif
139144

140-
$(package)_config_opts_linux = -qt-xcb
145+
$(package)_config_opts_linux = -xcb
141146
$(package)_config_opts_linux += -no-xcb-xlib
142147
$(package)_config_opts_linux += -no-feature-xlib
143148
$(package)_config_opts_linux += -system-freetype
@@ -156,6 +161,7 @@ $(package)_config_opts_s390x_linux = -platform linux-g++ -xplatform bitcoin-linu
156161

157162
$(package)_config_opts_mingw32 = -no-opengl
158163
$(package)_config_opts_mingw32 += -no-dbus
164+
$(package)_config_opts_mingw32 += -no-freetype
159165
$(package)_config_opts_mingw32 += -xplatform win32-g++
160166
$(package)_config_opts_mingw32 += "QMAKE_CFLAGS = '$($(package)_cflags) $($(package)_cppflags)'"
161167
$(package)_config_opts_mingw32 += "QMAKE_CXXFLAGS = '$($(package)_cflags) $($(package)_cppflags)'"
@@ -168,7 +174,6 @@ $(package)_config_opts_android = -xplatform android-clang
168174
$(package)_config_opts_android += -android-sdk $(ANDROID_SDK)
169175
$(package)_config_opts_android += -android-ndk $(ANDROID_NDK)
170176
$(package)_config_opts_android += -android-ndk-platform android-$(ANDROID_API_LEVEL)
171-
$(package)_config_opts_android += -device-option CROSS_COMPILE="$(host)-"
172177
$(package)_config_opts_android += -egl
173178
$(package)_config_opts_android += -qpa xcb
174179
$(package)_config_opts_android += -no-eglfs
@@ -243,17 +248,16 @@ define $(package)_preprocess_cmds
243248
rm -f $(BASEDIR)/.qmake.stash && \
244249
patch -p1 -i $($(package)_patch_dir)/drop_lrelease_dependency.patch && \
245250
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_pwd.patch && \
251+
patch -p1 -i $($(package)_patch_dir)/dont_hardcode_x86_64.patch && \
246252
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch && \
247253
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch && \
248-
patch -p1 -i $($(package)_patch_dir)/fix_android_qmake_conf.patch && \
249254
patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
250-
patch -p1 -i $($(package)_patch_dir)/fix_android_pch.patch && \
251255
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
252-
patch -p1 -i $($(package)_patch_dir)/no_sdk_version_check.patch && \
253-
patch -p1 -i $($(package)_patch_dir)/fix_lib_paths.patch && \
254256
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
255257
patch -p1 -i $($(package)_patch_dir)/fix_limits_header.patch && \
256258
patch -p1 -i $($(package)_patch_dir)/fix_montery_include.patch && \
259+
patch -p1 -i $($(package)_patch_dir)/fix_bigsur_style.patch && \
260+
patch -p1 -i $($(package)_patch_dir)/no_qrhi.patch && \
257261
cp $($(package)_patch_dir)/subdirs.pro subdirs.pro && \
258262
sed -i.old "s|updateqm.commands = \$$$$\$$$$LRELEASE|updateqm.commands = $($(package)_extract_dir)/qttools/bin/lrelease|" qttranslations/translations/translations.pro && \
259263
mkdir -p qtbase/mkspecs/macx-clang-linux &&\
@@ -273,6 +277,7 @@ define $(package)_config_cmds
273277
export PKG_CONFIG_SYSROOT_DIR=/ && \
274278
export PKG_CONFIG_LIBDIR=$(host_prefix)/lib/pkgconfig && \
275279
export PKG_CONFIG_PATH=$(host_prefix)/share/pkgconfig && \
280+
export QT_MAC_SDK_NO_VERSION_CHECK=1 && \
276281
cd qtbase && \
277282
./configure -top-level $($(package)_config_opts) && \
278283
cd .. && \

0 commit comments

Comments
 (0)