Browse Source

Use runtime linking of QT libdbus, use custom/temp. SDK URL

tags/v0.15.1
Jonas Schnelli 4 years ago
parent
commit
59d063d076
No account linked to committer's email address
3 changed files with 3 additions and 3 deletions
  1. 1
    1
      .travis.yml
  2. 0
    1
      contrib/devtools/symbol-check.py
  3. 2
    1
      depends/packages/qt.mk

+ 1
- 1
.travis.yml View File

@@ -22,7 +22,7 @@ env:
- CCACHE_TEMPDIR=/tmp/.ccache-temp
- CCACHE_COMPRESS=1
- BASE_OUTDIR=$TRAVIS_BUILD_DIR/out
- SDK_URL=https://bitcoincore.org/depends-sources/sdks
- SDK_URL=https://bitcoin.jonasschnelli.ch/sdks
- PYTHON_DEBUG=1
- WINEDEBUG=fixme-all
matrix:

+ 0
- 1
contrib/devtools/symbol-check.py View File

@@ -68,7 +68,6 @@ b'libX11.so.6', # part of X11
b'libxcb.so.1', # part of X11
b'libfontconfig.so.1', # font support
b'libfreetype.so.6', # font parsing
b'libdbus-1.so.3', # inter process communication (notification system)
b'libdl.so.2' # programming interface to dynamic linker
}


+ 2
- 1
depends/packages/qt.mk View File

@@ -5,7 +5,7 @@ $(package)_suffix=opensource-src-$($(package)_version).tar.gz
$(package)_file_name=qtbase-$($(package)_suffix)
$(package)_sha256_hash=0ac67cf8d66d52b995f96c31c4b48117a1afb3db99eaa93e20ccd8f7f55f7fde
$(package)_dependencies=openssl
$(package)_linux_dependencies=freetype fontconfig dbus libxcb libX11 xproto libXext
$(package)_linux_dependencies=freetype fontconfig libxcb libX11 xproto libXext
$(package)_build_subdir=qtbase
$(package)_qt_libs=corelib network widgets gui plugins testlib
$(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
$(package)_config_opts += -bindir $(build_prefix)/bin
$(package)_config_opts += -c++11
$(package)_config_opts += -confirm-license
$(package)_config_opts += -dbus-runtime
$(package)_config_opts += -hostprefix $(build_prefix)
$(package)_config_opts += -no-alsa
$(package)_config_opts += -no-audio-backend

Loading…
Cancel
Save