Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: backport dd4c3ddadbb9 from chromium #33038

Merged
merged 4 commits into from
Mar 23, 2022
Merged

chore: backport dd4c3ddadbb9 from chromium #33038

merged 4 commits into from
Mar 23, 2022

Conversation

Molytho
Copy link

@Molytho Molytho commented Feb 22, 2022

Chromium tries to bind to the newest version of some wayland interfaces. This causes issues when it doesn't actually support the version.
This patch ensures that only supported versions are bound to.

Fixes #32487
Backport of #32603

Notes: none.

@welcome
Copy link

welcome bot commented Feb 22, 2022

💖 Thanks for opening this pull request! 💖

We use semantic commit messages to streamline the release process. Before your pull request can be merged, you should update your pull request title to start with a semantic prefix.

Examples of commit messages with semantic prefixes:

  • fix: don't overwrite prevent_default if default wasn't prevented
  • feat: add app.isPackaged() method
  • docs: app.isDefaultProtocolClient is now available on Linux

Things that will help get your PR across the finish line:

  • Follow the JavaScript, C++, and Python coding style.
  • Run npm run lint locally to catch formatting errors earlier.
  • Document any user-facing changes you've made following the documentation styleguide.
  • Include tests when adding/changing behavior.
  • Include screenshots and animated GIFs whenever possible.

We get a lot of pull requests on this repo, so please be patient and we will get back to you as soon as we can.

@Molytho Molytho marked this pull request as ready for review February 22, 2022 22:43
@Molytho Molytho requested review from a team as code owners February 22, 2022 22:43
@Molytho
Copy link
Author

Molytho commented Feb 22, 2022

Can somebody please test it on gnome and kde. It work perfect under sway but after downgrading I noticed that it doesn't work with wlroots 0.14 because it passes a read-write file descriptor (which is technically not an issue but makes an assertion fail). The spec says the file descriptor should be mapped with MAP_PRIVATE which would need bigger adjustments.
As I except it to cause issues on non-rolling release distros/maybe gnome and kde it's maybe better to not merge it as it is.

@Molytho
Copy link
Author

Molytho commented Feb 24, 2022

Now it should no longer cause any regressions. Now I manually mmap the file descriptor and munmap it afterwards. This approach is inspired by code I found in Chromium 96.

@jkleinsc jkleinsc added the backport-check-skip Skip trop's backport validity checking label Feb 28, 2022
archlinux-github pushed a commit to archlinux/svntogit-community that referenced this pull request Mar 14, 2022
Apply PR electron/electron#33038 (fixes FS#74109).


git-svn-id: file:///srv/repos/svn-community/svn@1153075 9fca08f4-af9d-4005-b8df-a31f2cc04f65
archlinux-github pushed a commit to archlinux/svntogit-community that referenced this pull request Mar 14, 2022
Apply PR electron/electron#33038 (fixes FS#74109).

git-svn-id: file:///srv/repos/svn-community/svn@1153075 9fca08f4-af9d-4005-b8df-a31f2cc04f65
@zcbenz zcbenz added the semver/patch backwards-compatible bug fixes label Mar 23, 2022
@zcbenz zcbenz merged commit a9a3910 into electron:15-x-y Mar 23, 2022
@trop trop bot added the 15-x-y label Mar 23, 2022
@release-clerk
Copy link

release-clerk bot commented Mar 23, 2022

No Release Notes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
15-x-y backport-check-skip Skip trop's backport validity checking semver/patch backwards-compatible bug fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants