Skip to content

Commit 983c848

Browse files
committed
Merge #16352: build: prune dbus from depends
e8fabd9 build: prune dbus from depends (fanquake) Pull request description: Since #8210 (59d063d), we've been passing `-dbus-runtime` when configuring Qt. ``` qtbase-opensource-src-5.9.7 $ ./configure -h | grep -i dbus -no-dbus ............. Do not build the Qt D-Bus module -dbus-linked ......... Build Qt D-Bus and link to libdbus-1 [auto] -dbus-runtime ........ Build Qt D-Bus and dynamically load libdbus-1 [no] ``` This means we don't actually seem to be using the `D-Bus` we build in depends. This was pointed out by theuni at the time, [here](bitcoin/bitcoin#7993 (comment)) and [here](bitcoin/bitcoin#8210 (comment)), but was never followed up. dongcarl also bought it up as part of #16150. I've tested building and running `bitcoin-qt` using depends on Debian. Needs further testing. ACKs for top commit: laanwj: code review ACK e8fabd9 Tree-SHA512: 164e6e52b6f97c04aef42bd185e2a157bc1a42103840f9404c5a795749f45a8c2c35f35873395a3a56398b3cd5955496b90d9c885d929b434c9bc871695abe20
2 parents f5a01cf + e8fabd9 commit 983c848

File tree

3 files changed

+1
-29
lines changed

3 files changed

+1
-29
lines changed

depends/packages/dbus.mk

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

depends/packages/packages.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ packages:=boost openssl libevent
33
qt_native_packages = native_protobuf
44
qt_packages = qrencode protobuf zlib
55

6-
qt_linux_packages:=qt expat dbus libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
6+
qt_linux_packages:=qt expat libxcb xcb_proto libXau xproto freetype fontconfig libX11 xextproto libXext xtrans
77

88
rapidcheck_packages = rapidcheck
99

doc/dependencies.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ These are the dependencies currently used by Bitcoin Core. You can find instruct
88
| Berkeley DB | [4.8.30](https://www.oracle.com/technetwork/database/database-technologies/berkeleydb/downloads/index.html) | 4.8.x | No | | |
99
| Boost | [1.70.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) | | | |
11-
| D-Bus | [1.10.18](https://cgit.freedesktop.org/dbus/dbus/tree/NEWS?h=dbus-1.10) | | No | Yes | |
1211
| Expat | [2.2.6](https://libexpat.github.io/) | | No | Yes | |
1312
| fontconfig | [2.12.1](https://www.freedesktop.org/software/fontconfig/release/) | | No | Yes | |
1413
| FreeType | [2.7.1](https://download.savannah.gnu.org/releases/freetype) | | No | | |

0 commit comments

Comments
 (0)