diff options
| author | fanquake <fanquake@gmail.com> | 2021-12-03 19:56:21 +0800 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2021-12-03 20:56:45 +0800 |
| commit | c9b63ab61e4c0c94430064c9025c040f2abaeefc (patch) | |
| tree | 635186c9e1e48f1eab2a73e80804cf1bbd3fe6a0 /build-aux/m4 | |
| parent | 345c8180d7b743af9fb77bbdede1c4a2ee9440a4 (diff) | |
| parent | c0a1c3ca0894d4bb932bc13c6b92babe6df65030 (diff) | |
Merge bitcoin/bitcoin#23489: build: Qt 5.15.2
c0a1c3ca0894d4bb932bc13c6b92babe6df65030 ci: Bump Qt to 5.15.2 in the native Windows task (Hennadii Stepanov)
06aca8aacbf5f5561d4bdaadf1b89a436961df04 doc: Update `build_msvc/README.md` for Qt 5.15.2 (Hennadii Stepanov)
1732eaba4f853814a3c3b770462f14eee55a8c98 build, qt: Fix regression in rendering on macOS Big Sur (Hennadii Stepanov)
c870027cc261ebe6e0e2030df06619a8f663e80a build: qt 5.15.2 (fanquake)
904ba2aa40c5399b956fd97c8b38bca8a1aa32c7 build: add libxcb_util_wm 0.4.1 (fanquake)
0e2ca89a78156d362249369f011cac73d24aeef3 build: add libxcb_util_image 0.4.0 (fanquake)
36af9b6c94b911daf4c1d5b1d65e9386d540990f build: add libxcb_util_keysyms 0.4.0 (fanquake)
b3cfbf5af29be1a03efcae04eb0242fc6bca95e4 build: add libxcb_util_render 0.3.9 (fanquake)
e545b56dc599a5aca25f4a0f84430440653b09e4 build: add libxcb_util 0.4.0 (fanquake)
937b36b5f07f085d25d7f28036e98123837bee13 build: libxcb 1.14 (fanquake)
01544dd78ccc0b0474571da854e27adef97137fb build: freetype 2.11.0 (fanquake)
10ac182f4cfbb7d3494576f68f9aa2e33403f4cb build: expat 2.4.1 (fanquake)
d3d547c545021d8339db666d36e48f10ea478f9c build: xcb_proto 1.14.1 (fanquake)
fc65127244320500022c3772141850eda28b99af build: libXau 1.0.9 (fanquake)
06975573210d9662485f057949829fef8dde7ef1 build: xproto 7.0.31 (fanquake)
Pull request description:
Hebasto asked for this branch to be resurrected, so here it is.
Guix Builds:
```bash
9bbbec69cc56255fbe0dd6f63d26b6d76ebc071275cd603a2388baf028a2e5fe guix-build-c0a1c3ca0894/output/aarch64-linux-gnu/SHA256SUMS.part
57aee87dedbf3c41e52e7bb18cb52e96a656696699ce0663a35cf6c030ca048a guix-build-c0a1c3ca0894/output/aarch64-linux-gnu/bitcoin-c0a1c3ca0894-aarch64-linux-gnu-debug.tar.gz
8d2842ff0995bf53f4ed6f67e3db3d33f4cd1d117b15122d750875a3681dba21 guix-build-c0a1c3ca0894/output/aarch64-linux-gnu/bitcoin-c0a1c3ca0894-aarch64-linux-gnu.tar.gz
67b342e95d8fa5d897d84e53f5bb5cc8323921d31c51497196b54d2c2d62e915 guix-build-c0a1c3ca0894/output/arm-linux-gnueabihf/SHA256SUMS.part
f52e8b2e28236a7fb0dd26989c39ef18472161a892f90e62cea26ae7c2daadaf guix-build-c0a1c3ca0894/output/arm-linux-gnueabihf/bitcoin-c0a1c3ca0894-arm-linux-gnueabihf-debug.tar.gz
1dce8e6953e52874b98a0f5dafaebf068584984e2c3cd40d3110dd3c5c0d2f8d guix-build-c0a1c3ca0894/output/arm-linux-gnueabihf/bitcoin-c0a1c3ca0894-arm-linux-gnueabihf.tar.gz
f8328d777b0f1be68408c2df5907c4dd890dd0617b1aa747b3bf140f84c0f61d guix-build-c0a1c3ca0894/output/dist-archive/bitcoin-c0a1c3ca0894.tar.gz
b3e71decb914c3be9c88586084853ab086d77929707c1a7649991b75c734f3e2 guix-build-c0a1c3ca0894/output/powerpc64-linux-gnu/SHA256SUMS.part
30a8ad718f848297ac1dc8f48eadb37b983d5837f807ecfedb6723932cb5e84a guix-build-c0a1c3ca0894/output/powerpc64-linux-gnu/bitcoin-c0a1c3ca0894-powerpc64-linux-gnu-debug.tar.gz
111444d627aa837e8a7f450dfe304ff20139ca018a293c9a5e8c5aec33ab75a9 guix-build-c0a1c3ca0894/output/powerpc64-linux-gnu/bitcoin-c0a1c3ca0894-powerpc64-linux-gnu.tar.gz
ef815b019722b774995e2a999cdbd79b34b8636f92f62b2f8e6b99b294ad1bc5 guix-build-c0a1c3ca0894/output/powerpc64le-linux-gnu/SHA256SUMS.part
5521bf88d0febd79301dbed30205c1bef6257eb03ae5d4a5227bac3b66b0b427 guix-build-c0a1c3ca0894/output/powerpc64le-linux-gnu/bitcoin-c0a1c3ca0894-powerpc64le-linux-gnu-debug.tar.gz
6d2ae36ec34e7b5d3d84d6a50595c39c1d89b2659ed9eba5e7c8b21a9cbb8f04 guix-build-c0a1c3ca0894/output/powerpc64le-linux-gnu/bitcoin-c0a1c3ca0894-powerpc64le-linux-gnu.tar.gz
8aa9cb8a5585d8b27feafa8403fcba803152fb154d7c308f6759670c11107cfa guix-build-c0a1c3ca0894/output/riscv64-linux-gnu/SHA256SUMS.part
7abbf8efdc91399ab0d2dde18b3be19734f956a07ed1cc19f8f5178647f9ac94 guix-build-c0a1c3ca0894/output/riscv64-linux-gnu/bitcoin-c0a1c3ca0894-riscv64-linux-gnu-debug.tar.gz
1dfd20f75feb316882043dd081f0ee4bd2032481e17d40f7ae9f2b430c316754 guix-build-c0a1c3ca0894/output/riscv64-linux-gnu/bitcoin-c0a1c3ca0894-riscv64-linux-gnu.tar.gz
1949530e8e68b68c72f627296995b93e9ec048c2740274a8874fe9565eca4a46 guix-build-c0a1c3ca0894/output/x86_64-apple-darwin19/SHA256SUMS.part
ab2e63f9f58834ddc0fc5f83a2a7938ffcf8057392f0c5ce92a8d456e9b8e4af guix-build-c0a1c3ca0894/output/x86_64-apple-darwin19/bitcoin-c0a1c3ca0894-osx-unsigned.dmg
38958a096117542cde4dcac318d116fdeec3237c95ebf88fff0e76570002109e guix-build-c0a1c3ca0894/output/x86_64-apple-darwin19/bitcoin-c0a1c3ca0894-osx-unsigned.tar.gz
8841df372ef1ea670dc8d4f82b007420140a39454371be47193e484a4f95fd76 guix-build-c0a1c3ca0894/output/x86_64-apple-darwin19/bitcoin-c0a1c3ca0894-osx64.tar.gz
4e0d6b6a715d987ff025e45782dd6a47cfdac904a26d932c9c84de7eb8b699d4 guix-build-c0a1c3ca0894/output/x86_64-linux-gnu/SHA256SUMS.part
3ac4c326313650c0d0a35560c4073f0c3fcbf7002c5b5c918e7186627c8ed392 guix-build-c0a1c3ca0894/output/x86_64-linux-gnu/bitcoin-c0a1c3ca0894-x86_64-linux-gnu-debug.tar.gz
fcd45fe54cb86a7e9240a6bbe2170926e6db32ee55b821af332348d4c4e1d3a4 guix-build-c0a1c3ca0894/output/x86_64-linux-gnu/bitcoin-c0a1c3ca0894-x86_64-linux-gnu.tar.gz
72deb4fc1c5b70ae329ab04862e822911708f3c4a4d8a0bbb5796d9a64985414 guix-build-c0a1c3ca0894/output/x86_64-w64-mingw32/SHA256SUMS.part
78ae8f495bfb02198b00b7fc72b67fb0595f81dd9e3aef45e5103efea90451d9 guix-build-c0a1c3ca0894/output/x86_64-w64-mingw32/bitcoin-c0a1c3ca0894-win-unsigned.tar.gz
962fcf4ce63e5a89fb1e74e19dbc1aeffc4d5b753ab8e19fcf2249ce21766c5b guix-build-c0a1c3ca0894/output/x86_64-w64-mingw32/bitcoin-c0a1c3ca0894-win64-debug.zip
3929916755d599b133304acd94462afad1ba73d5516f6f9786aff565c6ac8818 guix-build-c0a1c3ca0894/output/x86_64-w64-mingw32/bitcoin-c0a1c3ca0894-win64-setup-unsigned.exe
66e2030476de85437e1593b7d2f4efd4a8837de8b2479217f9246d8028256e08 guix-build-c0a1c3ca0894/output/x86_64-w64-mingw32/bitcoin-c0a1c3ca0894-win64.zip
```
ACKs for top commit:
hebasto:
re-ACK c0a1c3ca0894d4bb932bc13c6b92babe6df65030
Tree-SHA512: 33e7a3e022dfc3a7e93f4bc2acf887c7c2afacc182352f4dfb5917342d5923e0a8d17eaf10928e68b666db6ab748cc02d3d3dfb41e4aad7d296a403b79b3e63d
Diffstat (limited to 'build-aux/m4')
| -rw-r--r-- | build-aux/m4/bitcoin_qt.m4 | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/build-aux/m4/bitcoin_qt.m4 b/build-aux/m4/bitcoin_qt.m4 index 8b90ee3dc4..8346e549b8 100644 --- a/build-aux/m4/bitcoin_qt.m4 +++ b/build-aux/m4/bitcoin_qt.m4 @@ -67,10 +67,11 @@ AC_DEFUN([BITCOIN_QT_INIT],[ AS_IF([test "x$with_gui" = xqt5_debug], [AS_CASE([$host], [*darwin*], [qt_lib_suffix=_debug], - [*mingw*], [qt_lib_suffix=d], [qt_lib_suffix= ]); bitcoin_qt_want_version=qt5], [qt_lib_suffix= ]) + AS_CASE([$host], [*android*], [qt_lib_suffix=_$ANDROID_ARCH]) + AC_ARG_WITH([qt-incdir],[AS_HELP_STRING([--with-qt-incdir=INC_DIR],[specify qt include path (overridden by pkgconfig)])], [qt_include_path=$withval], []) AC_ARG_WITH([qt-libdir],[AS_HELP_STRING([--with-qt-libdir=LIB_DIR],[specify qt lib path (overridden by pkgconfig)])], [qt_lib_path=$withval], []) AC_ARG_WITH([qt-plugindir],[AS_HELP_STRING([--with-qt-plugindir=PLUGIN_DIR],[specify qt plugin path (overridden by pkgconfig)])], [qt_plugin_path=$withval], []) @@ -149,8 +150,6 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ _BITCOIN_QT_CHECK_STATIC_PLUGIN([QWindowsVistaStylePlugin], [-lqwindowsvistastyle]) AC_DEFINE([QT_QPA_PLATFORM_WINDOWS], [1], [Define this symbol if the qt platform is windows]) elif test "x$TARGET_OS" = xlinux; then - dnl workaround for https://bugreports.qt.io/browse/QTBUG-74874 - AX_CHECK_LINK_FLAG([-lxcb-shm], [QT_LIBS="$QT_LIBS -lxcb-shm"], [AC_MSG_ERROR([could not link against -lxcb-shm])]) _BITCOIN_QT_CHECK_STATIC_PLUGIN([QXcbIntegrationPlugin], [-lqxcb]) AC_DEFINE([QT_QPA_PLATFORM_XCB], [1], [Define this symbol if the qt platform is xcb]) elif test "x$TARGET_OS" = xdarwin; then @@ -162,7 +161,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ _BITCOIN_QT_CHECK_STATIC_PLUGIN([QMacStylePlugin], [-lqmacstyle]) AC_DEFINE([QT_QPA_PLATFORM_COCOA], [1], [Define this symbol if the qt platform is cocoa]) elif test "x$TARGET_OS" = xandroid; then - QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lqtforandroid -ljnigraphics -landroid -lqtfreetype $QT_LIBS" + QT_LIBS="-Wl,--export-dynamic,--undefined=JNI_OnLoad -lplugins_platforms_qtforandroid_$ANDROID_ARCH -ljnigraphics -landroid -lqtfreetype_$ANDROID_ARCH $QT_LIBS" AC_DEFINE([QT_QPA_PLATFORM_ANDROID], [1], [Define this symbol if the qt platform is android]) fi fi @@ -353,6 +352,7 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_LIBS], [ PKG_CHECK_MODULES([QT_INPUT], [${qt_lib_prefix}InputSupport], [QT_LIBS="$QT_INPUT_LIBS $QT_LIBS"]) PKG_CHECK_MODULES([QT_SERVICE], [${qt_lib_prefix}ServiceSupport], [QT_LIBS="$QT_SERVICE_LIBS $QT_LIBS"]) PKG_CHECK_MODULES([QT_XCBQPA], [${qt_lib_prefix}XcbQpa], [QT_LIBS="$QT_XCBQPA_LIBS $QT_LIBS"]) + PKG_CHECK_MODULES([QT_XKBCOMMON], [${qt_lib_prefix}XkbCommonSupport], [QT_LIBS="$QT_XKBCOMMON_LIBS $QT_LIBS"]) elif test "x$TARGET_OS" = xdarwin; then PKG_CHECK_MODULES([QT_CLIPBOARD], [${qt_lib_prefix}ClipboardSupport${qt_lib_suffix}], [QT_LIBS="$QT_CLIPBOARD_LIBS $QT_LIBS"]) PKG_CHECK_MODULES([QT_GRAPHICS], [${qt_lib_prefix}GraphicsSupport${qt_lib_suffix}], [QT_LIBS="$QT_GRAPHICS_LIBS $QT_LIBS"]) @@ -360,7 +360,8 @@ AC_DEFUN([_BITCOIN_QT_CHECK_STATIC_LIBS], [ elif test "x$TARGET_OS" = xwindows; then PKG_CHECK_MODULES([QT_WINDOWSUIAUTOMATION], [${qt_lib_prefix}WindowsUIAutomationSupport${qt_lib_suffix}], [QT_LIBS="$QT_WINDOWSUIAUTOMATION_LIBS $QT_LIBS"]) elif test "x$TARGET_OS" = xandroid; then - PKG_CHECK_MODULES([QT_EGL], [${qt_lib_prefix}EglSupport], [QT_LIBS="$QT_EGL_LIBS $QT_LIBS"]) + PKG_CHECK_MODULES([QT_EGL], [${qt_lib_prefix}EglSupport${qt_lib_suffix}], [QT_LIBS="$QT_EGL_LIBS $QT_LIBS"]) + PKG_CHECK_MODULES([QT_SERVICE], [${qt_lib_prefix}ServiceSupport${qt_lib_suffix}], [QT_LIBS="$QT_SERVICE_LIBS $QT_LIBS"]) fi ]) |