don't open versioned shared libraries in wayland and x11 #1334

Open

xdBronch wants to merge 2 commits from xdBronch/dynlib into main

xdBronch commented

2025-01-09 06:47:38 +00:00

(Migrated from github.com)

By selecting this checkbox, I agree to license my contributions to this project under the license(s) described in the LICENSE file, and I have the right to do so or have received permission to do so by an employer or client I am producing work for whom has this right.

- [x] By selecting this checkbox, I agree to license my contributions to this project under the license(s) described in the LICENSE file, and I have the right to do so or have received permission to do so by an employer or client I am producing work for whom has this right.

emidoots commented

2025-01-12 16:14:17 +00:00

(Migrated from github.com)

Have conflicts after merging #1332 first.

Also not convinced this is the right solution; I think we need to make all our DynLib usage:

Try to load the major-versioned name first
If it fails, log that it failed and that we are falling back to the unversioned symlink
Fallback to the unversioned symlink and try to continue

Can possibly be done as an implementation detail of mach.dynLibOpen

Have conflicts after merging #1332 first. Also not convinced this is the right solution; I think we need to make all our DynLib usage: 1. Try to load the major-versioned name first 2. If it fails, log that it failed and that we are falling back to the unversioned symlink 3. Fallback to the unversioned symlink and try to continue Can possibly be done as an implementation detail of `mach.dynLibOpen`

This pull request has changes conflicting with the target branch.

src/core/linux/Wayland.zig
src/core/linux/X11.zig

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin xdBronch/dynlib:xdBronch/dynlib

git switch xdBronch/dynlib

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff xdBronch/dynlib

git switch xdBronch/dynlib

git rebase main

git switch main

git merge --ff-only xdBronch/dynlib

git switch xdBronch/dynlib

git rebase main

git switch main

git merge --no-ff xdBronch/dynlib

git switch main

git merge --squash xdBronch/dynlib