Skip to content

Commit 62c1547

Browse files
laanwjlaanwj
committed
Merge #14849: depends: qt 5.9.7
a46c847 depends: disable unused qt features (fanquake) 73b46ee depends: qt 5.9.7 (fanquake) 095e765 depends: expat 2.2.6 (fanquake) Pull request description: This PR upgrades `expat` and `qt` in depends. The intention is to upgrade Qt in master to the latest point release of the current Qt LTS. This change can then be back-ported to the 0.17 branch (wether it makes it into 0.17.1 or not). Then, sometime before the 0.18.0 release, we could move to using Qt 5.12+ in depends (which is also LTS). That discussion, as well as minimum supported Qt versions is in #13478. ### Qt 5.9.7 [Release announcement](https://blog.qt.io/blog/2018/10/23/qt-5-9-7-released/) [Changelog](https://bugreports.qt.io/browse/QTBUG-70888?filter=20149) ### Expat 2.2.6 * Avoid doing arithmetic with NULL pointers in XML_GetBuffer * Fix 2.2.5 regression with suspend-resume while parsing a document like <root/> Full changelog [here](https://github.com/libexpat/libexpat/blob/R_2_2_6/expat/Changes) bitcoin/bitcoin@a46c847 disables a bunch of qt features we aren't currently using. This speeds up the qt depends build slightly (also decreases the size of the built `qt-5.9.7` tar by about 2%). The disabling is somewhat unintuitive, hence `[wip]` until after a travis run and gitian build. Tree-SHA512: f3d51d0c7dabe5b7043ef23f264abf2aba3e94e55ffc9d5c323b153b6852d9161368e1591db3ba28f3498f0613bac77d40b855bd0465296f52be03f9230656de
2 parents 7202ae2 + a46c847 commit 62c1547

File tree

3 files changed

+22
-10
lines changed

3 files changed

+22
-10
lines changed

‎depends/packages/expat.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package=expat
2-
$(package)_version=2.2.5
3-
$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_2_2_5/
2+
$(package)_version=2.2.6
3+
$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_2_2_6/
44
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
5-
$(package)_sha256_hash=d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
5+
$(package)_sha256_hash=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2
66

77
define $(package)_set_vars
8-
$(package)_config_opts=--disable-static
8+
$(package)_config_opts=--disable-static --without-docbook
99
endef
1010

1111
define $(package)_config_cmds

‎depends/packages/qt.mk

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
PACKAGE=qt
2-
$(package)_version=5.9.6
2+
$(package)_version=5.9.7
33
$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
44
$(package)_suffix=opensource-src-$($(package)_version).tar.xz
55
$(package)_file_name=qtbase-$($(package)_suffix)
6-
$(package)_sha256_hash=eed620cb268b199bd83b3fc6a471c51d51e1dc2dbb5374fc97a0cc75facbe36f
6+
$(package)_sha256_hash=36dd9574f006eaa1e5af780e4b33d11fe39d09fd7c12f3b9d83294174bd28f00
77
$(package)_dependencies=openssl zlib
88
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
99
$(package)_build_subdir=qtbase
1010
$(package)_qt_libs=corelib network widgets gui plugins testlib
1111
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch fix_riscv64_arch.patch xkb-default.patch
1212

1313
$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
14-
$(package)_qttranslations_sha256_hash=9822084f8e2d2939ba39f4af4c0c2320e45d5996762a9423f833055607604ed8
14+
$(package)_qttranslations_sha256_hash=b36da7d93c3ab6fca56b32053bb73bc619c8b192bb89b74e3bcde2705f1c2a14
1515

1616
$(package)_qttools_file_name=qttools-$($(package)_suffix)
17-
$(package)_qttools_sha256_hash=50e75417ec0c74bb8b1989d1d8e981ee83690dce7dfc0c2169f7c00f397e5117
17+
$(package)_qttools_sha256_hash=d62e0f70d99645d6704dbb8976fb2222443061743689943d40970c52c49367a1
1818

1919
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2020
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -27,6 +27,7 @@ $(package)_config_opts += -c++std c++11
2727
$(package)_config_opts += -confirm-license
2828
$(package)_config_opts += -dbus-runtime
2929
$(package)_config_opts += -hostprefix $(build_prefix)
30+
$(package)_config_opts += -no-compile-examples
3031
$(package)_config_opts += -no-cups
3132
$(package)_config_opts += -no-egl
3233
$(package)_config_opts += -no-eglfs
@@ -69,9 +70,20 @@ $(package)_config_opts += -system-zlib
6970
$(package)_config_opts += -static
7071
$(package)_config_opts += -silent
7172
$(package)_config_opts += -v
73+
$(package)_config_opts += -no-feature-dial
74+
$(package)_config_opts += -no-feature-ftp
75+
$(package)_config_opts += -no-feature-lcdnumber
76+
$(package)_config_opts += -no-feature-pdf
7277
$(package)_config_opts += -no-feature-printer
7378
$(package)_config_opts += -no-feature-printdialog
7479
$(package)_config_opts += -no-feature-concurrent
80+
$(package)_config_opts += -no-feature-sql
81+
$(package)_config_opts += -no-feature-statemachine
82+
$(package)_config_opts += -no-feature-syntaxhighlighter
83+
$(package)_config_opts += -no-feature-textbrowser
84+
$(package)_config_opts += -no-feature-textodfwriter
85+
$(package)_config_opts += -no-feature-udpsocket
86+
$(package)_config_opts += -no-feature-wizard
7587
$(package)_config_opts += -no-feature-xml
7688

7789
ifneq ($(build_os),darwin)

‎doc/dependencies.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
99
| Boost | [1.64.0](https://www.boost.org/users/download/) | [1.47.0](https://github.com/bitcoin/bitcoin/pull/8920) | No | | |
1010
| Clang | | [3.3+](https://llvm.org/releases/download.html) (C++11 support) | | | |
1111
| D-Bus | [1.10.18](https://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.10) | | No | Yes | |
12-
| Expat | [2.2.5](https://libexpat.github.io/) | | No | Yes | |
12+
| Expat | [2.2.6](https://libexpat.github.io/) | | No | Yes | |
1313
| fontconfig | [2.12.1](https://www.freedesktop.org/software/fontconfig/release/) | | No | Yes | |
1414
| FreeType | [2.7.1](https://download.savannah.gnu.org/releases/freetype) | | No | | |
1515
| GCC | | [4.8+](https://gcc.gnu.org/) (C++11 support) | | | |
@@ -23,7 +23,7 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
2323
| protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | |
2424
| Python (tests) | | [3.4](https://www.python.org/downloads) | | | |
2525
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | |
26-
| Qt | [5.9.6](https://download.qt.io/official_releases/qt/) | [5.2](https://github.com/bitcoin/bitcoin/pull/14725) | No | | |
26+
| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | [5.2](https://github.com/bitcoin/bitcoin/pull/14725) | No | | |
2727
| XCB | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L87) (Linux only) |
2828
| xkbcommon | | | | | [Yes](https://github.com/bitcoin/bitcoin/blob/master/depends/packages/qt.mk#L86) (Linux only) |
2929
| ZeroMQ | [4.2.5](https://github.com/zeromq/libzmq/releases) | 4.0.0 | No | | |

0 commit comments

Comments
 (0)