Skip to content

Commit 800dea8

Browse files
committed
Upgrade Qt depends to 5.9.6
1 parent 70afa65 commit 800dea8

File tree

3 files changed

+7
-42
lines changed

3 files changed

+7
-42
lines changed

build-aux/m4/bitcoin_qt.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,7 @@ AC_DEFUN([_BITCOIN_QT_CHECK_QT58],[
306306
307307
308308
dnl Internal. Check if the linked version of Qt was built as static libs.
309-
dnl Requires: Qt5. This check cannot determine if Qt4 is static.
309+
dnl Requires: Qt5.
310310
dnl Requires: INCLUDES and LIBS must be populated as necessary.
311311
dnl Output: bitcoin_cv_static_qt=yes|no
312312
dnl Output: Defines QT_STATICPLUGIN if plugins are static.

depends/packages/qt.mk

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
PACKAGE=qt
2-
$(package)_version=5.9.4
3-
$(package)_download_path=http://download.qt.io/official_releases/qt/5.9/$($(package)_version)/submodules
2+
$(package)_version=5.9.6
3+
$(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=69e6bde3ab00673a77e1506173551fec7d0cd899fcbf9b1260517db1b61004cf
6+
$(package)_sha256_hash=eed620cb268b199bd83b3fc6a471c51d51e1dc2dbb5374fc97a0cc75facbe36f
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
11-
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch qfixed-coretext.patch
11+
$(package)_patches=fix_qt_pkgconfig.patch mac-qmake.conf fix_configure_mac.patch fix_no_printer.patch
1212

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

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

1919
$(package)_extra_sources = $($(package)_qttranslations_file_name)
2020
$(package)_extra_sources += $($(package)_qttools_file_name)
@@ -131,7 +131,6 @@ define $(package)_preprocess_cmds
131131
patch -p1 -i $($(package)_patch_dir)/fix_qt_pkgconfig.patch &&\
132132
patch -p1 -i $($(package)_patch_dir)/fix_configure_mac.patch &&\
133133
patch -p1 -i $($(package)_patch_dir)/fix_no_printer.patch &&\
134-
patch -p1 -i $($(package)_patch_dir)/qfixed-coretext.patch &&\
135134
echo "!host_build: QMAKE_CFLAGS += $($(package)_cflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
136135
echo "!host_build: QMAKE_CXXFLAGS += $($(package)_cxxflags) $($(package)_cppflags)" >> qtbase/mkspecs/common/gcc-base.conf && \
137136
echo "!host_build: QMAKE_LFLAGS += $($(package)_ldflags)" >> qtbase/mkspecs/common/gcc-base.conf && \

depends/patches/qt/qfixed-coretext.patch

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

0 commit comments

Comments
 (0)