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 flatpak-cargo-generator #405

Merged
merged 3 commits into from
Apr 6, 2024
Merged

Conversation

zecakeh
Copy link
Contributor

@zecakeh zecakeh commented Apr 5, 2024

Various errors I encountered while trying the script and then to build a Flatpak app.

See each commit message for details.

See the last commit of flathub/org.gnome.Fractal#41 for the differences in the generated sources.

@hfiguiere
Copy link
Collaborator

I wonder how this intersects with #323 and #325.

@hfiguiere
Copy link
Collaborator

and also #399

@hfiguiere hfiguiere added the cargo Rust cargo label Apr 5, 2024
@hfiguiere
Copy link
Collaborator

And issue #367, seems that this would fix it.

@zecakeh
Copy link
Contributor Author

zecakeh commented Apr 6, 2024

After checking all of those:

There can be other keys pointing to the workspace in that case, like dev-dependencies.
Recursing should handle it properly.
It behaves the same as dev-dependencies.
Those features are additive so the workspace should not overwrite
the ones declared on the crate
@zecakeh
Copy link
Contributor Author

zecakeh commented Apr 6, 2024

I rebased on master and dropped the last commit, to fix conflicts.

@hfiguiere hfiguiere merged commit fc7b6e1 into flatpak:master Apr 6, 2024
@hfiguiere
Copy link
Collaborator

thanks!

@zecakeh zecakeh deleted the cargo-fixes branch April 14, 2024 14:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cargo Rust cargo
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants