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

Correct AppStream metainfo XML fixing validations errors. #13309

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

petterreinholdtsen
Copy link

The specification state that the ID and file name should be in reverse DNS form, and that '-' is an invalid character, so the customary way to handle it is replace '-' with '_'.

Also, replaced http with https links for screen shots and drop the now obsolete tag.

Adjusted build system to use the new file name.

The specification state that the ID and file name should be in
reverse DNS form, and that '-' is an invalid character, so the
customary way to handle it is replace '-' with '_'.

Also, replaced http with https links for screen shots and drop
the now obsolete <developer> tag.

Adjusted build system to use the new file name.
@petterreinholdtsen
Copy link
Author

https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-id-generic got some more information on ID generation.

Copy link
Member

@BhaaLseN BhaaLseN left a comment

Choose a reason for hiding this comment

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

Not sure what's going on with the flatpak builders, they fail to get the screenshots for the Flatpak repo. That's the step over here:
https://github.com/dolphin-emu/sadm/blob/9f48ecae866d4b47988b66cbc564652b0bcfc96e/roles/buildbot/etc/master.cfg#L608

@@ -1,11 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2016 Jeremy Newton -->
<component type="desktop-application">
<id>org.DolphinEmu.dolphin-emu</id>
<id>org.dolphin_emu.dolphin_emu</id>
Copy link
Member

Choose a reason for hiding this comment

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

I'm not sure if you can just go and change this without breaking Flatpak (or something on FlatHub). At least I recall some discussions about the ID, and someone saying that there is a lot more things involved than just changing it in here.

But I think @OatmealDome can probably add more to this.

Comment on lines -6 to -8
<developer id="org.dolphin-emu">
<name>Dolphin Emulator Project</name>
</developer>
Copy link
Member

Choose a reason for hiding this comment

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

Did you intentionally remove the <developer> tag? According to your own link, it is still an allowed tag in there. (Then again, I didn't see any XSD or DTD, so I don't know if it is potentially just in the wrong location and needs to move to later, or perhaps earlier, in the file.)

@petterreinholdtsen
Copy link
Author

petterreinholdtsen commented Jan 25, 2025 via email

@BhaaLseN
Copy link
Member

That's weird. https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-developer mentions it explicitly, and so does the example at the end. It's just an Info though, so maybe keep it around anyways?

Also, I wonder if it makes sense to add this validation to CI at some point. Or not, as it's a single file that rarely ever changes I guess (besides the fact that it is a template, not the actual file used in the end).

@petterreinholdtsen
Copy link
Author

petterreinholdtsen commented Jan 25, 2025 via email

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

2 participants