Skip to content

Commit eca5085

Browse files
committed
depends: static libxcb_cursor
Modern Ubuntu isn't shipping with this library installed by default. Staticly link it to remove the need for end-users to install it. Closes #33432.
1 parent 89144eb commit eca5085

File tree

3 files changed

+1
-8
lines changed

3 files changed

+1
-8
lines changed

contrib/guix/symbol-check.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@
112112
'libfontconfig.so.1', # font support
113113
'libfreetype.so.6', # font parsing
114114
'libdl.so.2', # programming interface to dynamic linker
115-
'libxcb-cursor.so.0',
116115
'libxcb-icccm.so.4',
117116
'libxcb-image.so.0',
118117
'libxcb-shm.so.0',

depends/packages/libxcb_util_cursor.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ $(package)_sha256_hash=0e9c5446dc6f3beb8af6ebfcc9e27bcc6da6fe2860f7fc07b99144dfa
66
$(package)_dependencies=libxcb libxcb_util_render libxcb_util_image
77

88
define $(package)_set_vars
9-
$(package)_config_opts = --disable-static
9+
$(package)_config_opts = --disable-shared
1010
$(package)_config_opts += --disable-dependency-tracking --enable-option-checking
1111
endef
1212

doc/build-unix.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if yo
8181

8282
sudo apt-get install qt6-base-dev qt6-tools-dev qt6-l10n-tools qt6-tools-dev-tools libgl-dev
8383

84-
For Qt 6.5 and later, the `libxcb-cursor0` package must be installed at runtime.
85-
8684
Additionally, to support Wayland protocol for modern desktop environments:
8785

8886
sudo apt install qt6-wayland
@@ -133,8 +131,6 @@ the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if yo
133131

134132
sudo dnf install qt6-qtbase-devel qt6-qttools-devel
135133

136-
For Qt 6.5 and later, the `xcb-util-cursor` package must be installed at runtime.
137-
138134
Additionally, to support Wayland protocol for modern desktop environments:
139135

140136
sudo dnf install qt6-qtwayland
@@ -182,8 +178,6 @@ the necessary parts of Qt, the libqrencode and pass `-DBUILD_GUI=ON`. Skip if yo
182178

183179
apk add qt6-qtbase-dev qt6-qttools-dev
184180

185-
For Qt 6.5 and later, the `xcb-util-cursor` package must be installed at runtime.
186-
187181
The GUI will be able to encode addresses in QR codes unless this feature is explicitly disabled. To install libqrencode, run:
188182

189183
apk add libqrencode-dev

0 commit comments

Comments
 (0)