Skip to content

Commit

Permalink
depends: expat 2.2.6 and qt 5.9.7
Browse files Browse the repository at this point in the history
Summary:
```
This PR upgrades expat and qt in depends.

[...]

(commit id) 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%).
```

Backport of core [[bitcoin/bitcoin#14849 | PR14849]].

Test Plan: Run the Gitian builds.

Reviewers: #bitcoin_abc, deadalnix

Reviewed By: #bitcoin_abc, deadalnix

Differential Revision: https://reviews.bitcoinabc.org/D5606
  • Loading branch information
fanquake authored and sickpig committed May 13, 2021
1 parent 55c001e commit ca284da
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 10 deletions.
8 changes: 4 additions & 4 deletions depends/packages/expat.mk
@@ -1,11 +1,11 @@
package=expat
$(package)_version=2.2.5
$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_2_2_5/
$(package)_version=2.2.6
$(package)_download_path=https://github.com/libexpat/libexpat/releases/download/R_2_2_6/
$(package)_file_name=$(package)-$($(package)_version).tar.bz2
$(package)_sha256_hash=d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6
$(package)_sha256_hash=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2

define $(package)_set_vars
$(package)_config_opts=--disable-static
$(package)_config_opts=--disable-static --without-docbook
endef

define $(package)_config_cmds
Expand Down
20 changes: 16 additions & 4 deletions depends/packages/qt.mk
@@ -1,20 +1,20 @@
PACKAGE=qt
$(package)_version=5.9.6
$(package)_version=5.9.7
$(package)_download_path=https://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
$(package)_suffix=opensource-src-$($(package)_version).tar.xz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=eed620cb268b199bd83b3fc6a471c51d51e1dc2dbb5374fc97a0cc75facbe36f
$(package)_sha256_hash=36dd9574f006eaa1e5af780e4b33d11fe39d09fd7c12f3b9d83294174bd28f00
$(package)_dependencies=openssl zlib
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch fix_rcc_determinism.patch xkb-default.patch

$(package)_qttranslations_file_name=qttranslations-$($(package)_suffix)
$(package)_qttranslations_sha256_hash=9822084f8e2d2939ba39f4af4c0c2320e45d5996762a9423f833055607604ed8
$(package)_qttranslations_sha256_hash=b36da7d93c3ab6fca56b32053bb73bc619c8b192bb89b74e3bcde2705f1c2a14

$(package)_qttools_file_name=qttools-$($(package)_suffix)
$(package)_qttools_sha256_hash=50e75417ec0c74bb8b1989d1d8e981ee83690dce7dfc0c2169f7c00f397e5117
$(package)_qttools_sha256_hash=d62e0f70d99645d6704dbb8976fb2222443061743689943d40970c52c49367a1

$(package)_extra_sources = $($(package)_qttranslations_file_name)
$(package)_extra_sources += $($(package)_qttools_file_name)
Expand All @@ -26,6 +26,7 @@ $(package)_config_opts += -bindir $(build_prefix)/bin
$(package)_config_opts += -c++std c++11
$(package)_config_opts += -confirm-license
$(package)_config_opts += -hostprefix $(build_prefix)
$(package)_config_opts += -no-compile-examples
$(package)_config_opts += -no-cups
$(package)_config_opts += -no-egl
$(package)_config_opts += -no-eglfs
Expand Down Expand Up @@ -69,9 +70,20 @@ $(package)_config_opts += -system-zlib
$(package)_config_opts += -static
$(package)_config_opts += -silent
$(package)_config_opts += -v
$(package)_config_opts += -no-feature-dial
$(package)_config_opts += -no-feature-ftp
$(package)_config_opts += -no-feature-lcdnumber
$(package)_config_opts += -no-feature-pdf
$(package)_config_opts += -no-feature-printer
$(package)_config_opts += -no-feature-printdialog
$(package)_config_opts += -no-feature-concurrent
$(package)_config_opts += -no-feature-sql
$(package)_config_opts += -no-feature-statemachine
$(package)_config_opts += -no-feature-syntaxhighlighter
$(package)_config_opts += -no-feature-textbrowser
$(package)_config_opts += -no-feature-textodfwriter
$(package)_config_opts += -no-feature-udpsocket
$(package)_config_opts += -no-feature-wizard
$(package)_config_opts += -no-feature-xml

$(package)_config_opts_darwin = -no-dbus
Expand Down
4 changes: 2 additions & 2 deletions doc/dependencies.md
Expand Up @@ -13,7 +13,7 @@ These dependencies are required:
| Clang | | [5](http://llvm.org/releases/download.html) (C++17 support) | | | | | |
| CMake | | [3.13](https://cmake.org/download/) | | | | | |
| D-Bus | [1.10.18](https://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.10) | | No | Yes | | | |
| Expat | [2.2.5](https://libexpat.github.io/) | | No | Yes | | | |
| Expat | [2.2.6](https://libexpat.github.io/) | | No | Yes | | | |
| fontconfig | [2.12.6](https://www.freedesktop.org/software/fontconfig/release/) | | No | Yes | | | |
| FreeType | [2.7.1](http://download.savannah.gnu.org/releases/freetype) | | No | | | | |
| GCC | | [7.0](https://gcc.gnu.org/) (C++17 support) | | | | | |
Expand All @@ -30,7 +30,7 @@ These dependencies are required:
| protobuf | [2.6.1](https://github.com/google/protobuf/releases) | | No | | | Payments in GUI | Data interchange format used for payment protocol (only needed when BIP70 enabled)
| Python (tests) | | [3.6](https://www.python.org/downloads) | | | | | |
| qrencode | [3.4.4](https://fukuchi.org/works/qrencode) | | No | | | QR codes in GUI | Optional for generating QR codes (only needed when GUI enabled)
| Qt | [5.9.6](https://download.qt.io/official_releases/qt/) | 5.5.1 | No | | | GUI | GUI toolkit (only needed when GUI enabled) |
| Qt | [5.9.7](https://download.qt.io/official_releases/qt/) | 5.5.1 | No | | | GUI | GUI toolkit (only needed when GUI enabled) |
| univalue ||||| | Utility | JSON parsing and encoding (bundled version will be used unless --with-system-univalue passed to configure)
| XCB | | | | | Yes (Linux only) | | |
| xkbcommon | | | | | Yes (Linux only) | | |
Expand Down

0 comments on commit ca284da

Please sign in to comment.