Skip to content

feat: flatpak support#23

Merged
edfloreshz merged 15 commits intocosmic-utils:mainfrom
wiiznokes:flatpak
Sep 29, 2024
Merged

feat: flatpak support#23
edfloreshz merged 15 commits intocosmic-utils:mainfrom
wiiznokes:flatpak

Conversation

@wiiznokes
Copy link
Copy Markdown
Contributor

@wiiznokes wiiznokes commented Sep 24, 2024

update the manifest for flatpak suport.

  • removed the just module because it was installed in the final package
  • put the app icon in scalable dir, and remove other because its redundant
  • rename some file
  • put the same appid everywhere
  • fr translation
  • add cargo-source.json
  • simplification of the justfile

Note:

for generating the cargo source:

git clone https://github.com/flatpak/flatpak-builder-tools
python3 flatpak-builder-tools/cargo/flatpak-cargo-generator.py ./Cargo.lock -o cargo-sources.json

for building and installing

flatpak-builder \
        --force-clean \
        --verbose \
        --ccache \
        --user --install \
        --install-deps-from=flathub \
        --repo=repo \
        flatpak-out \
        dev.edfloreshz.CosmicTweaks.json

I tested and everything seems to work (expect the spacing and padding stuff but i think it unrelated because other change of the config works)

@wiiznokes
Copy link
Copy Markdown
Contributor Author

note that it may be preferable to create the flatpak repo now @edfloreshz, and i can create a pull request there to avoid merging the big cargo-sources.json. But you can already test the flatpak with this branch.

@wiiznokes wiiznokes marked this pull request as ready for review September 24, 2024 18:53
@edfloreshz
Copy link
Copy Markdown
Member

On second thought, could you change dev.edfloreshz.Tweaks to dev.edfloreshz.CosmicTweaks? Given that this is a COSMIC specific app, i think it would be a better fit.

Sorry about that 😅

@edfloreshz
Copy link
Copy Markdown
Member

I'm currently traveling 🧳 , it may be a while before I can create the repository, we can hold this PR until then.

@wiiznokes
Copy link
Copy Markdown
Contributor Author

Yeah np

@edfloreshz
Copy link
Copy Markdown
Member

Perfect! I'll review when I'm on my laptop 💻 thanks

@edfloreshz
Copy link
Copy Markdown
Member

I'm reviewing the PR, could you rebase it with the latest changes?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Should this file be pushed?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Probably not, see #23 (comment)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

You can go ahead and delete it, I already pushed it to https://github.com/edfloreshz/flathub/tree/dev.edfloreshz.CosmicTweaks

Copy link
Copy Markdown
Member

@edfloreshz edfloreshz left a comment

Choose a reason for hiding this comment

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

Some minor changes

@wiiznokes
Copy link
Copy Markdown
Contributor Author

I'm reviewing the PR, could you rebase it with the latest changes?

Done

@edfloreshz
Copy link
Copy Markdown
Member

I'll try to make the Flathub repo tomorrow.

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Can you remove this file? I'm creating the repo but I need to merge this first.

Copy link
Copy Markdown
Member

@edfloreshz edfloreshz left a comment

Choose a reason for hiding this comment

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

I'll merge and delete the file later, I'm a bit short on time and I want the Flathub submission to proceed while I'm gone.

@edfloreshz edfloreshz merged commit 4c73f09 into cosmic-utils:main Sep 29, 2024
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