Skip to content

Commit 33fed61

Browse files
hebastodelta1
authored andcommitted
build: Update qt package up to 5.15.11
(cherry picked from commit 8047bb6)
1 parent 8dea4c3 commit 33fed61

5 files changed

Lines changed: 34 additions & 13 deletions

File tree

.cirrus.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,9 @@ win64_native_common: &win64_native_common
9494
CI_VCPKG_TAG: '2021.05.12'
9595
VCPKG_DOWNLOADS: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\downloads'
9696
VCPKG_DEFAULT_BINARY_CACHE: 'C:\Users\ContainerAdministrator\AppData\Local\vcpkg\archives'
97-
QT_DOWNLOAD_URL: 'https://download.qt.io/archive/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip'
98-
QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.3.zip'
99-
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.3'
97+
QT_DOWNLOAD_URL: 'https://download.qt.io/archive/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.zip'
98+
QT_LOCAL_PATH: 'C:\qt-everywhere-opensource-src-5.15.11.zip'
99+
QT_SOURCE_DIR: 'C:\qt-everywhere-src-5.15.11'
100100
QTBASEDIR: 'C:\Qt_static'
101101
x64_NATIVE_TOOLS: '"C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\VC\Auxiliary\Build\vcvars64.bat"'
102102
IgnoreWarnIntDirInTempDetected: 'true'

build_msvc/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Qt
2828
---------------------
2929
To build Bitcoin Core with the GUI, a static build of Qt is required.
3030

31-
1. Download a single ZIP archive of Qt source code from https://download.qt.io/official_releases/qt/ (e.g., [`qt-everywhere-opensource-src-5.15.3.zip`](https://download.qt.io/official_releases/qt/5.15/5.15.3/single/qt-everywhere-opensource-src-5.15.3.zip)), and expand it into a dedicated folder. The following instructions assume that this folder is `C:\dev\qt-source`.
31+
1. Download a single ZIP archive of Qt source code from https://download.qt.io/official_releases/qt/ (e.g., [`qt-everywhere-opensource-src-5.15.11.zip`](https://download.qt.io/official_releases/qt/5.15/5.15.11/single/qt-everywhere-opensource-src-5.15.11.zip)), and expand it into a dedicated folder. The following instructions assume that this folder is `C:\dev\qt-source`.
3232

3333
2. Open "x64 Native Tools Command Prompt for VS 2019", and input the following commands:
3434
```cmd

depends/packages/qt.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package=qt
2-
$(package)_version=5.15.3
2+
$(package)_version=5.15.11
33
$(package)_download_path=https://download.qt.io/official_releases/qt/5.15/$($(package)_version)/submodules
44
$(package)_suffix=everywhere-opensource-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=26394ec9375d52c1592bd7b689b1619c6b8dbe9b6f91fdd5c355589787f3a0b6
6+
$(package)_sha256_hash=425ad301acd91ca66c10c0dabee0704e2d0cd2801a6b670115800cbb95f84846
77
$(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
99
$(package)_linguist_tools = lrelease lupdate lconvert
@@ -16,10 +16,10 @@ $(package)_patches += use_android_ndk23.patch
1616
$(package)_patches += rcc_hardcode_timestamp.patch
1717

1818
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
19-
$(package)_qttranslations_sha256_hash=5d7869f670a135ad0986e266813b9dd5bbae2b09577338f9cdf8904d4af52db0
19+
$(package)_qttranslations_sha256_hash=a31785948c640b7c66d9fe2db4993728ca07f64e41c560b3625ad191b276ff20
2020

2121
$(package)_qttools_file_name=qttools-$($(package)_suffix)
22-
$(package)_qttools_sha256_hash=463b2fe71a085e7ab4e39333ae360ab0ec857b966d7a08f752c427e5df55f90d
22+
$(package)_qttools_sha256_hash=7cd847ae6ff09416df617136eadcaf0eb98e3bc9b89979219a3ea8111fb8d339
2323

2424
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2525
$(package)_extra_sources += $($(package)_qttools_file_name)

depends/patches/qt/fix_android_jni_static.patch

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
--- old/qtbase/src/plugins/platforms/android/androidjnimain.cpp
22
+++ new/qtbase/src/plugins/platforms/android/androidjnimain.cpp
3-
@@ -934,6 +934,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
3+
@@ -979,6 +979,14 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void */*reserved*/)
44
__android_log_print(ANDROID_LOG_FATAL, "Qt", "registerNatives failed");
55
return -1;
66
}
@@ -13,6 +13,5 @@
1313
+ }
1414
+
1515
QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false);
16-
17-
m_javaVM = vm;
1816

17+
m_javaVM = vm;

doc/dependencies.md

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,27 @@ Some dependencies are not needed in all configurations. The following are some f
4444
* If the systemtap dependency is absent, USDT support won't compiled in.
4545
* ZeroMQ is needed only with the `--with-zmq` option.
4646

47-
#### Other
48-
* Not-Qt-bundled zlib is required to build the [DMG tool](../contrib/macdeploy/README.md#deterministic-macos-dmg-notes) from the libdmg-hfsplus project.
47+
### GUI
48+
| Dependency | Releases | Version used | Minimum required | Runtime |
49+
| --- | --- | --- | --- | --- |
50+
| [Fontconfig](../depends/packages/fontconfig.mk) | [link](https://www.freedesktop.org/wiki/Software/fontconfig/) | [2.12.6](https://github.com/bitcoin/bitcoin/pull/23495) | 2.6 | Yes |
51+
| [FreeType](../depends/packages/freetype.mk) | [link](https://freetype.org) | [2.11.0](https://github.com/bitcoin/bitcoin/commit/01544dd78ccc0b0474571da854e27adef97137fb) | 2.3.0 | Yes |
52+
| [qrencode](../depends/packages/qrencode.mk) | [link](https://fukuchi.org/works/qrencode/) | [4.1.1](https://github.com/bitcoin/bitcoin/pull/27312) | | No |
53+
| [Qt](../depends/packages/qt.mk) | [link](https://download.qt.io/official_releases/qt/) | [5.15.11](https://github.com/bitcoin/bitcoin/pull/28769) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No |
54+
55+
### Networking
56+
| Dependency | Releases | Version used | Minimum required | Runtime |
57+
| --- | --- | --- | --- | --- |
58+
| [libnatpmp](../depends/packages/libnatpmp.mk) | [link](https://github.com/miniupnp/libnatpmp/) | commit [07004b9...](https://github.com/bitcoin/bitcoin/pull/25917) | | No |
59+
| [MiniUPnPc](../depends/packages/miniupnpc.mk) | [link](https://miniupnp.tuxfamily.org/) | [2.2.2](https://github.com/bitcoin/bitcoin/pull/20421) | 2.1 | No |
60+
61+
### Notifications
62+
| Dependency | Releases | Version used | Minimum required | Runtime |
63+
| --- | --- | --- | --- | --- |
64+
| [ZeroMQ](../depends/packages/zeromq.mk) | [link](https://github.com/zeromq/libzmq/releases) | [4.3.4](https://github.com/bitcoin/bitcoin/pull/23956) | 4.0.0 | No |
65+
66+
### Wallet
67+
| Dependency | Releases | Version used | Minimum required | Runtime |
68+
| --- | --- | --- | --- | --- |
69+
| [Berkeley DB](../depends/packages/bdb.mk) (legacy wallet) | [link](https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.30 | 4.8.x | No |
70+
| [SQLite](../depends/packages/sqlite.mk) | [link](https://sqlite.org) | [3.38.5](https://github.com/bitcoin/bitcoin/pull/25378) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | No |

0 commit comments

Comments
 (0)