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 amarok to 3.0.0 #4
Merged
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
dc2a6be
Update amarok-2.9.71.tar.xz to 2.9.82
flathubbot 1ffe5b2
Remove upstreamed patches
travier 5407eae
Update amarok to 3.0.0
travier 2964157
Add appstream metadata patch
travier a812498
Add mariadb (for mysqle)
travier a7da7c2
Fix mariadb build
jbruechert 2b59a4f
Keep fmt on version 8
travier File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| From 1df673defcc4ea62edbf1a964eec289a42499a42 Mon Sep 17 00:00:00 2001 | ||
| From: Tuomas Nurmi <tuomas@norsumanageri.org> | ||
| Date: Tue, 30 Apr 2024 10:01:24 +0300 | ||
| Subject: [PATCH] Remove extra .desktop from appstream id | ||
|
|
||
| --- | ||
| src/org.kde.amarok.appdata.xml | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/src/org.kde.amarok.appdata.xml b/src/org.kde.amarok.appdata.xml | ||
| index da6eaf7219..34194d312f 100644 | ||
| --- a/src/org.kde.amarok.appdata.xml | ||
| +++ b/src/org.kde.amarok.appdata.xml | ||
| @@ -1,6 +1,6 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <component type="desktop"> | ||
| - <id>org.kde.amarok.desktop</id> | ||
| + <id>org.kde.amarok</id> | ||
| <launchable type="desktop-id">org.kde.amarok.desktop</launchable> | ||
| <metadata_license>CC0-1.0</metadata_license> | ||
| <project_license>GPL-2.0+</project_license> | ||
| -- | ||
| GitLab | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You can now drop this patch, I added all beta only apps to exceptions flathub-infra/flatpak-builder-lint#388
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Well, It's been merged upstream already so it will be in the next update so I'm tempted to keep it here until then.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'd suggest reverting it at some point or adding a provides tag https://docs.flathub.org/docs/for-app-authors/metainfo-guidelines/#renaming-id-tag (I don't know if Discover supports merging entries with a
providestag, so you have to check if it will work)The split that I said has already happened:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
https://invent.kde.org/multimedia/amarok/-/issues/9
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
thanks!