Skip to content

Commit a9701de

Browse files
committed
Merge bitcoin/bitcoin#33217: depends: remove xinerama extension from libxcb
decc367 guix: remove libxcb-xinerama.so.0 from allowed libs (fanquake) 3d9314f depends: remove xinerama extension from libxcb (fanquake) Pull request description: This is listed on https://doc.qt.io/qt-5.15/linux-requirements.html as "recommended", and doesn't seem to be needed (only used for windowing over multiple screens support?) , and the fact that it's no-longer installed by default on modern linux distros (i.e Ubuntu), is annoying/confusing for users. See: bitcoin/bitcoin#30061 bitcoin/bitcoin#32097 bitcoin/bitcoin#33197 https://bitcoin.stackexchange.com/questions/122646/libxcb-xinerama0-library-required-by-bitcoin-qt I haven't tested the GUI with these changes. Just opening an alternative to #33197. Note that we also already have `libxcb-cursor0` documented as a potentially missing runtime dependency (see `build-unix.md`). ACKs for top commit: hebasto: ACK decc367. Tree-SHA512: 4131e665a0c48a866d2a6d1d3909a19481c20cf69c19ab14de63b379f73bff5151759b63504857f5ed2e01f58b895def1b7db532323ecc353fcd11493aa45c90
2 parents 78351ed + decc367 commit a9701de

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

contrib/guix/symbol-check.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
'libxcb-shape.so.0',
124124
'libxcb-sync.so.1',
125125
'libxcb-xfixes.so.0',
126-
'libxcb-xinerama.so.0',
127126
'libxcb-xkb.so.1',
128127
}
129128

depends/packages/libxcb.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ $(package)_config_opts += --disable-dri2 --disable-dri3 --disable-glx
1616
$(package)_config_opts += --disable-present --disable-record --disable-resource
1717
$(package)_config_opts += --disable-screensaver --disable-xevie --disable-xfree86-dri
1818
$(package)_config_opts += --disable-xinput --disable-xprint --disable-selinux
19-
$(package)_config_opts += --disable-xtest --disable-xv --disable-xvmc
19+
$(package)_config_opts += --disable-xtest --disable-xv --disable-xvmc --disable-xinerama
2020
endef
2121

2222
define $(package)_preprocess_cmds

0 commit comments

Comments
 (0)