x11rb: Update default cursor search path#930
Merged
mergify[bot] merged 1 commit intomasterfrom Jun 24, 2024
Merged
Conversation
97675aa to
68792e6
Compare
Owner
Author
|
Dunno what to do best about the effects of rust-lang/rust#123168 :-( |
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>
68792e6 to
bfc3247
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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.