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

Fixes to appdata for v2.4 #605

Merged
merged 1 commit into from
Jan 14, 2025
Merged

Fixes to appdata for v2.4 #605

merged 1 commit into from
Jan 14, 2025

Conversation

elblake
Copy link
Collaborator

@elblake elblake commented Jan 14, 2025

Updated appdata.xml to fix some errors of the flatpak lint

@dgud dgud merged commit 37d7953 into dgud:master Jan 14, 2025
2 checks passed
@Micheus
Copy link
Collaborator

Micheus commented Jan 14, 2025

Thanks for that @elblake

@elblake
Copy link
Collaborator Author

elblake commented Jan 14, 2025

You're welcome @Micheus

You'll need to change the JSON so the new wings.appdata.xml can be seen.

You can add as appdata.patch, same folder as com.wings3d.WINGS.json:
https://gist.github.com/elblake/281244d21934ac01263eeac2d234ded4

Reference the patch in JSON sources (only temporary it can be removed for the next version):

      "sources": [
        {
          "type": "git",
          "url": "https://github.com/dgud/wings.git",
          "tag": "v2.4",
          "commit": "c17b3d964ec970eed1f015997bb0c4eba0ccff45"
-        }
+        },
+        {
+          "type": "patch",
+          "path": "appdata.patch"
+        }
      ]

@Micheus
Copy link
Collaborator

Micheus commented Jan 14, 2025

@elblake, I'm a little confused here.

I saw you made the changes to wings.appdata.xml, but that didn't reflected in Flahub validating our flatpak.
I didn't find any reference about changing those missing infos except by updating the appstream data file that should be somewhere at Flathub repository.

Now you added this info here I thing it can make sense, but I'm still not sure about the way to reference the updated "/unix/wings.appdata.xml".
You are telling me to add a path file "appdata.patch" on the root folder and you are pointing me to an appdata.patch that contains a diff file stuff.

I'm not expert in Linux, so please make this easy to me. 😃

@elblake
Copy link
Collaborator Author

elblake commented Jan 14, 2025

@Micheus Sorry it took a bit of time to reply back.

The wings.appdata.xml that's been merged this pull request will be reflected when making the next version of the flatpak later on (v2.5). The patch file is the same changes to wings.appdata.xml but is like its own "branch" after commit c17b3d9.. to just patch the small change for this time only. The patch file was made using "git diff".

  • Download appdata.patch "raw" without changes (keep all lines like "git diff --...", and "index").
  • Add the appdata.patch file into the com.wings3d.WINGS repo same folder as the json.
  • Adding the {"type":"patch","path":"appdata.patch"} in the sources it will use the git at c17b3d9.. (same as usual) but then it will also automatically apply the git patch referenced in the file as well.

@dgud
Copy link
Owner

dgud commented Jan 15, 2025

Lets make a new version for flatpak, we add that to appdata file.
I can do it later but am at work now.

@Micheus
Copy link
Collaborator

Micheus commented Jan 15, 2025

Lets make a new version for flatpak, we add that to appdata file. I can do it later but am at work now.

I also think it will be better. Thanks.

@dgud
Copy link
Owner

dgud commented Jan 15, 2025

I have prepared for a new release, I've pushed a v2.4.1 tag.

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.

3 participants