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.

Sign up for GitHub

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

Jump to bottom

Update and patch libadwaita to 1.4.0 #1076

Merged
merged 3 commits into from
Nov 4, 2023
Merged

Update and patch libadwaita to 1.4.0 #1076

merged 3 commits into from
Nov 4, 2023

Conversation

danyeaw
Copy link
Member

@danyeaw danyeaw commented Sep 17, 2023 •
edited
Loading

This PR updates to the latest version and patches around two issues:

  1. AppStream and its dependencies like libxmlb aren't able to be built with MSVC since they make use of g_autoptr.
  2. There is an empty array initialization which isn't supported by ISO C99, but is filled in with a {0} by GCC unless pedantic warnings are enabled. This fails with MSVC.

This is a workaround for #1075.

@pbor
Copy link
Contributor

pbor commented Sep 18, 2023

I do not know enough about Adwaita to understand the implications of dropping appstream, but from what I can tell, I am ok with this approach.

Did we file this patch upstream?

@danyeaw
Copy link
Member Author

danyeaw commented Sep 19, 2023

Hey @pbor, the major one was filed and unfortunately closed about 3 months ago: https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/833

The empty initializer patch is at https://gitlab.gnome.org/GNOME/libadwaita/-/merge_requests/988

@danyeaw danyeaw requested a review from nacho October 10, 2023 11:44
@danyeaw
Copy link
Member Author

danyeaw commented Oct 24, 2023

@nacho Any thoughts on merging this?

@mitchhentges mitchhentges mentioned this pull request Oct 29, 2023
Closed
@nacho
Copy link
Contributor

nacho commented Oct 30, 2023

I guess let's get this in. I do not see anything better we can do here.

@danyeaw danyeaw merged commit dd2795b into main Nov 4, 2023
12 checks passed
@danyeaw danyeaw deleted the libadwaita-1.4 branch November 10, 2023 18:35
@danyeaw danyeaw mentioned this pull request Jan 20, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nacho nacho nacho approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@danyeaw @pbor @nacho