Skip to content

Commit 59d063d

Browse files
committed
Use runtime linking of QT libdbus, use custom/temp. SDK URL
1 parent 6194d9a commit 59d063d

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ env:
2222
- CCACHE_TEMPDIR=/tmp/.ccache-temp
2323
- CCACHE_COMPRESS=1
2424
- BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
25-
- SDK_URL=https://bitcoincore.org/depends-sources/sdks
25+
- SDK_URL=https://bitcoin.jonasschnelli.ch/sdks
2626
- PYTHON_DEBUG=1
2727
- WINEDEBUG=fixme-all
2828
matrix:

contrib/devtools/symbol-check.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,6 @@
6868
b'libxcb.so.1', # part of X11
6969
b'libfontconfig.so.1', # font support
7070
b'libfreetype.so.6', # font parsing
71-
b'libdbus-1.so.3', # inter process communication (notification system)
7271
b'libdl.so.2' # programming interface to dynamic linker
7372
}
7473

depends/packages/qt.mk

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ $(package)_suffix=opensource-src-$($(package)_version).tar.gz
55
$(package)_file_name=qtbase-$($(package)_suffix)
66
$(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde
77
$(package)_dependencies=openssl
8-
$(package)_linux_dependencies=freetype fontconfig dbus libxcb libX11 xproto libXext
8+
$(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=mac-qmake.conf mingw-uuidof.patch pidlist_absolute.patch fix-xcb-include-order.patch fix_qt_pkgconfig.patch
@@ -26,6 +26,7 @@ $(package)_config_opts_debug = -debug
2626
$(package)_config_opts += -bindir $(build_prefix)/bin
2727
$(package)_config_opts += -c++11
2828
$(package)_config_opts += -confirm-license
29+
$(package)_config_opts += -dbus-runtime
2930
$(package)_config_opts += -hostprefix $(build_prefix)
3031
$(package)_config_opts += -no-alsa
3132
$(package)_config_opts += -no-audio-backend

0 commit comments

Comments
 (0)