Skip to content

Cherry-pick #779, #781 to main - #782

Merged
bbhtt merged 5 commits into
mainfrom
bbhtt/appstream-png-main
Sep 15, 2026
Merged

bbhtt merged 5 commits into
mainfrom
bbhtt/appstream-png-main

Conversation

@bbhtt

@bbhtt bbhtt commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator

No description provided.

This additionally ensures the default format stays PNG consistent with
pre-1.2.0 behaviour and to preserve backwards compat while allowing
JXL if the required AppStream version (>=1.2.0) is available.

Related: #777
Related: #776
Closes: #776
Closes: #777
@bbhtt bbhtt changed the title Backport https://github.com/flatpak/flatpak-builder/pull/779 to main Backport #779 to main Sep 15, 2026
@bbhtt
bbhtt requested a review from smcv September 15, 2026 10:40

@smcv smcv left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

1.4.x to 1.5.x is surely a forward-port rather than a backport? But the code changes look about right. Let me try this on a system that has appstream 1.2.0.

@smcv smcv left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Yes, seems fine.

I think it would make sense to cherry-pick 72b7234 and 1da33b6 (#781) as part of this. They cherry-pick cleanly, and the tests pass on appstream 1.2.0 with or without them.

This is the same as assert_file_has_content, but uses POSIX extended
regexps (`grep -E`) instead of basic regexps (plain `grep`).

Signed-off-by: Simon McVittie <smcv@debian.org>
This made it feasible to diagnose #776.

Signed-off-by: Simon McVittie <smcv@debian.org>
@bbhtt

bbhtt commented Sep 15, 2026

Copy link
Copy Markdown
Collaborator Author

Thanks added those commits.

@bbhtt bbhtt changed the title Backport #779 to main Cherry-pick #779, #781 to main Sep 15, 2026
@bbhtt
bbhtt enabled auto-merge (rebase) September 15, 2026 10:50
@bbhtt
bbhtt merged commit f17e277 into main Sep 15, 2026
2 checks passed
@bbhtt
bbhtt deleted the bbhtt/appstream-png-main branch September 15, 2026 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants