Skip to content

x11rb: Update default cursor search path - #930

Merged
mergify[bot] merged 1 commit into
masterfrom
cursor-search-path
Jun 24, 2024
Merged

x11rb: Update default cursor search path#930
mergify[bot] merged 1 commit into
masterfrom
cursor-search-path

Conversation

@psychon

@psychon psychon commented Jun 23, 2024

Copy link
Copy Markdown
Owner

In 1, xcb-util-cursor's default search path was changed. This change was done to bring it in line with libXcursor's behaviour. In that library, in 2, ~/.local/share/icons was added to the default search path.

Additionally, /usr/X11R6/lib/X11/icons was never part of libXcursor's search path. It only searched there if you set --prefix or --datadir suitably, but in that case /usr/share/icons would disappear from the search path. This path was thus removed from xcb-util-cursor in 1.

In this commit, I bring x11rb in sync with xcb-util-cursor again.

@psychon
psychon force-pushed the cursor-search-path branch from 97675aa to 68792e6 Compare June 23, 2024 09:19
@psychon

psychon commented Jun 23, 2024

Copy link
Copy Markdown
Owner Author

Dunno what to do best about the effects of rust-lang/rust#123168 :-(

error: unnecessary qualification
  --> x11rb-protocol/src/wrapper.rs:44:35
   |
44 |         let size = self.0.len() / core::mem::size_of::<T>();
   |                                   ^^^^^^^^^^^^^^^^^^^^^^^
   |
note: the lint level is defined here
  --> x11rb-protocol/src/lib.rs:49:5
   |
49 |     unused_qualifications,
   |     ^^^^^^^^^^^^^^^^^^^^^
help: remove the unnecessary path segments
   |
44 -         let size = self.0.len() / core::mem::size_of::<T>();
44 +         let size = self.0.len() / size_of::<T>();
   |

@notgull

notgull commented Jun 23, 2024

Copy link
Copy Markdown
Collaborator

#931 was merged, so a rebase should fix the CI issues

In [1], xcb-util-cursor's default search path was changed. This change
was done to bring it in line with libXcursor's behaviour. In that
library, in [2], ~/.local/share/icons was added to the default search
path.

Additionally, /usr/X11R6/lib/X11/icons was never part of libXcursor's
search path. It only searched there if you set --prefix or --datadir
suitably, but in that case /usr/share/icons would disappear from the
search path. This path was thus removed from xcb-util-cursor in [1].

In this commit, I bring x11rb in sync with xcb-util-cursor again.

[1]: https://gitlab.freedesktop.org/xorg/lib/libxcb-cursor/-/commit/d28a3227eb9e4bdeeb4dd93017c298808bbe62ee
[2]: https://gitlab.freedesktop.org/xorg/lib/libxcursor/-/commit/2263c196cb0d

Signed-off-by: Uli Schlachter <psychon@znc.in>
@psychon
psychon force-pushed the cursor-search-path branch from 68792e6 to bfc3247 Compare June 24, 2024 14:46

@notgull notgull left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@mergify
mergify Bot merged commit 3e6b5ea into master Jun 24, 2024
@mergify
mergify Bot deleted the cursor-search-path branch June 24, 2024 14:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants