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

Add Flatpak manifest #187

Merged
merged 1 commit into from
Sep 26, 2022
Merged

Conversation

cassidyjames
Copy link
Contributor

This matches the manifest at Flathub, with the following changes:

  • Bumps FreeDesktop runtime to 22.08 since 20.08 is EOL
  • Changes the source to point to the current dir instead of the remote release archive

The reason for adding the manifest in-tree is that it enables using GNOME Builder to one-click build and run Popsicle; this makes it far, far easier for people like me to contribute. 😄

This matches the manifest at Flathub, with the following changes:
- Bumps FreeDesktop runtime to 22.08 since 20.08 is EOL
- Changes the source to point to the current dir instead of the archive
Copy link
Member

@jackpot51 jackpot51 left a comment

Choose a reason for hiding this comment

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

Looks good to me. I think QA should try running and using a flatpak built with this manifest, after which we can merge it.

@jackpot51 jackpot51 requested a review from a team September 26, 2022 18:57
@leviport
Copy link
Member

I haven't had to build a Flatpak locally yet, so I am referencing https://docs.flatpak.org/en/latest/first-build.html

I'm not sure if I'm doing something wrong, but I'm getting a failure in the sed line:

$ flatpak run org.flatpak.Builder --user --install --force-clean build-dir com.system76.Popsicle.json
Can't open /home/levi/repos/popsicle/generated-sources.json

(flatpak-builder:2): Json-WARNING **: 13:44:09.032: Failed to deserialize "sources" property of type "gpointer" for an object of type "BuilderModule"
Emptying app dir 'build-dir'
Downloading sources
Starting build of com.system76.Popsicle
Cache miss, checking out last cache hit
========================================================================
Building module popsicle in /home/levi/repos/popsicle/.flatpak-builder/build/popsicle-6
========================================================================
Running: sed -i 's|</launchable>|</launchable>\n<icon type="remote" height="512" width="512">https://github.com/pop-os/popsicle/master/gtk/assets/icons/512x512/apps/com.system76.Popsicle.png</icon>|' gtk/assets/com.system76.Popsicle.appdata.xml
sed: can't read gtk/assets/com.system76.Popsicle.appdata.xml: No such file or directory
Error: module popsicle: Child process exited with code 2

I don't really understand the failure though, because gtk/assets/com.system76/Popsicle.appdata.xml does exist. I've run without the --user and the --install flags, but I get the same error each time. Perhaps I am building the flatpak incorrectly?

@cassidyjames
Copy link
Contributor Author

@leviport the way I would recommend testing this would be to use GNOME Builder (e.g. from Flathub) and open the project. It should prompt you to install any SDKs needed in the environment, then let you one-click build and run it. But I can check what's needed (and maybe add to the README!) to do it all from the CLI.

Copy link
Member

@leviport leviport left a comment

Choose a reason for hiding this comment

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

Thanks, using Builder seemed to work (just with very long compile times). I was able to build and run Popsicle via Builder, and flashing images to USB devices worked as expected.

@jackpot51 jackpot51 merged commit c2ebdd3 into pop-os:master Sep 26, 2022
@cassidyjames cassidyjames deleted the flatpak-manifest branch September 27, 2022 02:59
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