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

Update appearance__message-dialogs.patch #114

Merged
merged 1 commit into from
Jan 25, 2025

Conversation

glitsj16
Copy link
Contributor

https://gitlab.gnome.org/GNOME/gtk/-/commit/82213003aa2c45caef890c3eb585e4a37d54013b broke the appearance__message-dialogs.patch. This PR fixes that.

HTH

@lah7 lah7 added the waiting for upstream Patch only applies to a future unreleased GTK version label Sep 16, 2024
@lah7 lah7 added patch improvement Improves an existing patch and removed waiting for upstream Patch only applies to a future unreleased GTK version labels Jan 25, 2025
Copy link
Owner

@lah7 lah7 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you very much! Much appreciated!

Must be a Gentoo user rolling with upstream's master gtk-3-24! 😄

Apologies for the silence - I was waiting for upstream to make a new release, just for the sake of simplicity of keeping our master branch linear with the latest GTK release (mainly, so our CI passes)

@lah7 lah7 merged commit 9129a63 into lah7:master Jan 25, 2025
0 of 2 checks passed
lah7 added a commit that referenced this pull request Jan 26, 2025
My bad, I overlooked the icon change when reviewing the changes in #114
(9129a63)

Originally patched in #113 (a42ef19)
lah7 added a commit that referenced this pull request Jan 26, 2025
Upstream caused a patch conflict:
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7587

The changes in #114 (9129a63) to fix the patch were not 100%
complete. The icon variable was set outside [update_accessible_name] of
the function [setup_type] that actually sets this icon. Even though
repeating the case select is a bit like code duplication, it works and
fixes the regression.
lah7 added a commit that referenced this pull request Jan 26, 2025
Upstream caused a patch conflict:
https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/7587

The changes in #114 (9129a63) to fix the patch were not 100%
complete. The icon variable was set outside [update_accessible_name] of
the function [setup_type] that actually sets this icon. Even though
repeating the case select is a bit like code duplication, it works and
fixes the regression.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
patch improvement Improves an existing patch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants