Skip to content

Commit 936da1a

Browse files
committed
merge bitcoin#29732: qt 5.15.13
1 parent c294b47 commit 936da1a

File tree

5 files changed

+6
-22
lines changed

5 files changed

+6
-22
lines changed

depends/packages/qt.mk

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package=qt
2-
$(package)_version=5.15.11
2+
$(package)_version=5.15.13
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=425ad301acd91ca66c10c0dabee0704e2d0cd2801a6b670115800cbb95f84846
6+
$(package)_sha256_hash=4cca51dcc1f22ceeee6b3e33cd1c3a60b14e85e24644dca3af89a2c2989ab809
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
@@ -15,7 +15,6 @@ $(package)_patches += no-xlib.patch
1515
$(package)_patches += fix_android_jni_static.patch
1616
$(package)_patches += dont_hardcode_pwd.patch
1717
$(package)_patches += qtbase-moc-ignore-gcc-macro.patch
18-
$(package)_patches += use_android_ndk23.patch
1918
$(package)_patches += rcc_hardcode_timestamp.patch
2019
$(package)_patches += duplicate_lcqpafonts.patch
2120
$(package)_patches += guix_cross_lib_path.patch
@@ -26,10 +25,10 @@ $(package)_patches += utc_from_string_no_optimize.patch
2625
$(package)_patches += windows_lto.patch
2726

2827
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
29-
$(package)_qttranslations_sha256_hash=a31785948c640b7c66d9fe2db4993728ca07f64e41c560b3625ad191b276ff20
28+
$(package)_qttranslations_sha256_hash=24d4c58bc2a40c0f44f59ee64af4192c7d0038c1e45af61646cfc5b65058f271
3029

3130
$(package)_qttools_file_name=qttools-$($(package)_suffix)
32-
$(package)_qttools_sha256_hash=7cd847ae6ff09416df617136eadcaf0eb98e3bc9b89979219a3ea8111fb8d339
31+
$(package)_qttools_sha256_hash=57c9794c572c4e02871f2e7581525752b0cf85ea16cfab23a4ac9ba7b39a5d34
3332

3433
$(package)_extra_sources = $($(package)_qttranslations_file_name)
3534
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -241,7 +240,6 @@ define $(package)_preprocess_cmds
241240
patch -p1 -i $($(package)_patch_dir)/fix_android_jni_static.patch && \
242241
patch -p1 -i $($(package)_patch_dir)/no-xlib.patch && \
243242
patch -p1 -i $($(package)_patch_dir)/qtbase-moc-ignore-gcc-macro.patch && \
244-
patch -p1 -i $($(package)_patch_dir)/use_android_ndk23.patch && \
245243
patch -p1 -i $($(package)_patch_dir)/memory_resource.patch && \
246244
patch -p1 -i $($(package)_patch_dir)/rcc_hardcode_timestamp.patch && \
247245
patch -p1 -i $($(package)_patch_dir)/duplicate_lcqpafonts.patch && \

depends/patches/qt/fix_android_jni_static.patch

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,3 @@
1515
QWindowSystemInterfacePrivate::TabletEvent::setPlatformSynthesizesMouse(false);
1616

1717
m_javaVM = vm;
18-

depends/patches/qt/memory_resource.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ and https://bugreports.qt.io/browse/QTBUG-114316
1717

1818
--- a/qtbase/src/corelib/global/qcompilerdetection.h
1919
+++ b/qtbase/src/corelib/global/qcompilerdetection.h
20-
@@ -1050,16 +1050,22 @@
20+
@@ -1055,16 +1055,22 @@
2121
# endif // !_HAS_CONSTEXPR
2222
# endif // !__GLIBCXX__ && !_LIBCPP_VERSION
2323
# endif // Q_OS_QNX

depends/patches/qt/use_android_ndk23.patch

Lines changed: 0 additions & 13 deletions
This file was deleted.

doc/dependencies.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ These are the dependencies currently used by Dash Core. You can find instruction
2121
| PCRE | | | | | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) |
2222
| Python (tests) | | [3.9](https://www.python.org/downloads) | | | |
2323
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
24-
| Qt | [5.15.11](https://download.qt.io/official_releases/qt/) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No | | |
24+
| Qt | [5.15.13](https://download.qt.io/official_releases/qt/) | [5.11.3](https://github.com/bitcoin/bitcoin/pull/24132) | No | | |
2525
| SQLite | [3.32.1](https://sqlite.org/download.html) | [3.7.17](https://github.com/bitcoin/bitcoin/pull/19077) | | | |
2626
| XCB | | | | | [Yes](https://github.com/dashpay/dash/blob/develop/depends/packages/qt.mk) (Linux only) |
2727
| systemtap ([tracing](tracing.md))| [4.8](https://sourceware.org/ftp/systemtap/releases/) | | | | |

0 commit comments

Comments
 (0)