Skip to content

Flathub updates for 5.8.0#864

Merged
hbitteur merged 7 commits intoAudiveris:masterfrom
mwilck:master
Nov 22, 2025
Merged

Flathub updates for 5.8.0#864
hbitteur merged 7 commits intoAudiveris:masterfrom
mwilck:master

Conversation

@mwilck
Copy link
Copy Markdown
Contributor

@mwilck mwilck commented Nov 18, 2025

@hbitteur:

This PR updates the flatpak/flathub submodule to 5.8.0.

Here is the Flatpak PR for beta branch.

I will wait until this shows up in flathub beta (probably tomorrow) and give it a quick test.
If that succeeds, I will create a PR for the flathub master branch.
That might add another empty merge commit in flatpak/flathub.

@mwilck
Copy link
Copy Markdown
Contributor Author

mwilck commented Nov 18, 2025

There are two commits in the PR which could in principle be squashed.

I kept them both as a reminder, because it's important to update to the current upstream (i.e. flathub) code base before running gradlew initFlathub. Otherwise, there will be a merge conflict in the flathub repo, and we can't force-push to the beta or master branches in flathub, thus we must avoid conflicts.

Updating to the upstream state in an intermediate step does not hurt, because initFlathub will overwrite the files anyway.

@mwilck
Copy link
Copy Markdown
Contributor Author

mwilck commented Nov 19, 2025

Merged flathub/org.audiveris.audiveris#9, and updated flatpak/flathub in this PR to point to the master commit.

@hbitteur hbitteur merged commit e90b97d into Audiveris:master Nov 22, 2025
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