Skip to content

gtk3: add missing libXdamage#207821

Merged
romildo merged 1 commit intoNixOS:stagingfrom
bobby285271:gtk3-libXdamage
Dec 27, 2022
Merged

gtk3: add missing libXdamage#207821
romildo merged 1 commit intoNixOS:stagingfrom
bobby285271:gtk3-libXdamage

Conversation

@bobby285271
Copy link
Copy Markdown
Member

@bobby285271 bobby285271 commented Dec 26, 2022

This fixes a regression introduced in this PR:

libXdamage is an optional dependency, however this is needed for XEmbed tray icons on MATE to work properly. This is already enabled in all other distributions (1 2 3 4 5) except us, this is also already required in gtk4.

Things done

@bobby285271
Copy link
Copy Markdown
Member Author

bobby285271 commented Dec 26, 2022

This is regressed in cd65dfa because libXdamage is propagated by mesa.

Built MATE VM on https://github.com/bobby285271/nixpkgs/commits/mate-test:

@ofborg ofborg bot added 11.by: package-maintainer This PR was created by a maintainer of all the package it changes. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. labels Dec 26, 2022
@jtojnar
Copy link
Copy Markdown
Member

jtojnar commented Dec 26, 2022

Ugh, I wish they would use feature option type.

Might as well add libXfixes: https://gitlab.gnome.org/GNOME/gtk/-/blob/gtk-3-24/meson.build#L577

libXdamage is an optional dependency, however this is needed for XEmbed
tray icons on MATE to work properly. This is already enabled in gtk4.

https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.36/meson.build#L583
https://gitlab.gnome.org/search?search=xdamage&project_id=665&group_id=8&search_code=true&repository_ref=gtk-3-24

Also explicitly add libXfixes since gtk3 also optionally directly depends
on it.

https://gitlab.gnome.org/GNOME/gtk/-/blob/3.24.36/meson.build#L577
@romildo romildo merged commit 6134954 into NixOS:staging Dec 27, 2022
@bobby285271 bobby285271 deleted the gtk3-libXdamage branch December 27, 2022 12:02
@jtojnar
Copy link
Copy Markdown
Member

jtojnar commented Dec 27, 2022

Thanks.

@bobby285271
Copy link
Copy Markdown
Member Author

I just saw this issue on some user's screenshot1 and noticed that I forget to take care of the backport 😓

Footnotes

  1. https://fosstodon.org/@wimpy/109809288769761330

@github-actions
Copy link
Copy Markdown
Contributor

github-actions bot commented Feb 6, 2023

Successfully created backport PR for staging-22.11:

@bobby285271 bobby285271 mentioned this pull request Aug 25, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 501-1000 This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-darwin: 501+ This PR causes many rebuilds on Darwin and should normally target the staging branches. 10.rebuild-linux: 501+ This PR causes many rebuilds on Linux and should normally target the staging branches. 10.rebuild-linux: 2501-5000 This PR causes many rebuilds on Linux and should target the staging branches. 11.by: package-maintainer This PR was created by a maintainer of all the package it changes.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants