Skip to content

[Backport staging-22.11] gtk3: add missing libXdamage#214874

Merged
bobby285271 merged 1 commit intostaging-22.11from
backport-207821-to-staging-22.11
Feb 6, 2023
Merged

[Backport staging-22.11] gtk3: add missing libXdamage#214874
bobby285271 merged 1 commit intostaging-22.11from
backport-207821-to-staging-22.11

Conversation

@github-actions
Copy link
Copy Markdown
Contributor

@github-actions github-actions bot commented Feb 6, 2023

Bot-based backport to staging-22.11, triggered by a label in #207821.

  • Before merging, ensure that this backport complies with the Criteria for Backporting.
    • Even as a non-commiter, if you find that it does not comply, leave a comment.

@github-actions github-actions bot mentioned this pull request Feb 6, 2023
Merged
2 tasks
@bobby285271
gtk3: add missing libXdamage, explicitly add libXfixes
e41c400 
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
(cherry picked from commit 6257a5a)
@bobby285271 bobby285271 marked this pull request as draft February 6, 2023 05:53
@bobby285271 bobby285271 force-pushed the backport-207821-to-staging-22.11 branch from b812b7f to e41c400 Compare February 6, 2023 05:53
@bobby285271 bobby285271 changed the base branch from staging-22.11 to release-22.11 February 6, 2023 05:54
@bobby285271
Copy link
Copy Markdown
Member

bobby285271 commented Feb 6, 2023

(Want to get ofborg feedback fast)

@ofborg build gtk3

@ofborg ofborg bot added 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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches. labels Feb 6, 2023
@bobby285271 bobby285271 changed the base branch from release-22.11 to staging-22.11 February 6, 2023 06:15
@bobby285271 bobby285271 marked this pull request as ready for review February 6, 2023 06:15
@bobby285271 bobby285271 mentioned this pull request Feb 6, 2023
Merged
2 tasks
@bobby285271
Copy link
Copy Markdown
Member

bobby285271 commented Feb 6, 2023

@ofborg build gtk3 gtk3.passthru.tests

@bobby285271 bobby285271 merged commit 1e5a0ec into staging-22.11 Feb 6, 2023
@bobby285271 bobby285271 deleted the backport-207821-to-staging-22.11 branch February 6, 2023 14:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hedning hedning Awaiting requested review from hedning

@amaxine amaxine Awaiting requested review from amaxine

@dasj19 dasj19 Awaiting requested review from dasj19

@7c6f434c 7c6f434c Awaiting requested review from 7c6f434c

@bobby285271 bobby285271 Awaiting requested review from bobby285271

Assignees

No one assigned

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: 5001+ This PR causes many rebuilds on Linux and must target the staging branches.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@bobby285271