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

Update Flatpak support #82

Merged
merged 13 commits into from
Apr 17, 2024
Merged

Conversation

R1kaB3rN
Copy link
Member

@R1kaB3rN R1kaB3rN commented Apr 2, 2024

This pull request updates the Flatpak manifest and the launcher to support running in a Flatpak environment. Flatpak clients who wish to use umu as their backend will be required to change their manifest to permit access to umu's $XDG_DATA_HOME/umu directory where the Steam Runtime platform and the launcher files will be stored/copied to.

@R1kaB3rN
Copy link
Member Author

R1kaB3rN commented Apr 2, 2024

cc @GloriousEggroll

@R1kaB3rN R1kaB3rN requested a review from GloriousEggroll April 2, 2024 17:35
@R1kaB3rN R1kaB3rN mentioned this pull request Apr 2, 2024
sha256: e25c4dd0636d04e7c8c534cf3c5bbdca5ae0d49f146ee8395306174700899952
- type: git
url: https://github.com/Open-Wine-Components/umu-launcher.git
branch: main
Copy link
Member Author

Choose a reason for hiding this comment

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

This won't build since the changes are not merged in main, so will probably have to create another branch

Copy link
Contributor

@loathingKernel loathingKernel left a comment

Choose a reason for hiding this comment

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

  • If we decide to spawn SLR through flatpak-spawn can you also make the flatpak manifest simpler?
  • Also we should update the the makefile to create a special umu-run for umu-launcher's Steam integration, to call the flatpak instead of .local/share/umu/umu_run.py, so we can make sure we always run the flatpak to update the user-local files on umu updates.

umu/umu_consts.py Outdated Show resolved Hide resolved
umu/umu_run.py Outdated Show resolved Hide resolved
umu/umu_run.py Outdated Show resolved Hide resolved
packaging/flatpak/org.openwinecomponents.umu.launcher.yml Outdated Show resolved Hide resolved
R1kaB3rN added 3 commits April 2, 2024 10:52
- The launcher will no longer have or use the cache directory ~/.cache/umu to store archives
@loathingKernel
Copy link
Contributor

loathingKernel commented Apr 3, 2024

Also we should update the the makefile to create a special umu-run for umu-launcher's Steam integration, to call the flatpak instead of .local/share/umu/umu_run.py, so we can make sure we always run the flatpak to update the user-local files on umu updates.

Attaching a patch for the makefile to resolve this 0001-makefile-Install-umu-run-for-umu-launcher-steam-tool.patch.txt

Patch does not include the required changes in the python code to not symlink umu_run.py into the steam compatibility tool.

R1kaB3rN and others added 5 commits April 3, 2024 11:00
Co-authored-by: Stelios Tsampas <[email protected]>
- Until more review, run the launcher and execute the command within the Flatpak sandbox
- Change branch from 'main' -> 'flatpak' for testing
@loathingKernel
Copy link
Contributor

loathingKernel commented Apr 3, 2024

Given that we use a script for flatpak in steam's compat tool, using symlinks for the system packages is of no value and just convolutes the code. Consider using a script in that case too. The makefile is already creating it and installing it for the package.

@R1kaB3rN
Copy link
Member Author

R1kaB3rN commented Apr 3, 2024

Given that we use a script for flatpak in steam's compat tool, using symlinks for the system packages is of no value and just convolutes the code. Consider using a script in that case too. The makefile is already creating it and installing it for the package.

It's fixed, but because there was a bug since the launcher would create the symbolic link to the entry point when it had already been created during the build process, resulting in a FileExistsError. This was a failure on my part for not testing it.

using symlinks for the system packages is of no value and just convolutes the code.

Let's please be careful not to reopen our past disagreement about symbolic links, whether that's your intention or not. Because to be honest, I'm still not quite settled or convinced about it and I only let that pass solely because I value your contribution to this project and would like to encourage others to contribute as well. However, if there's any complaints about it from anyone, causes any kind of issue or bugs like you did here, which I doubt, I may have to reconsider it.

@GloriousEggroll GloriousEggroll merged commit ad6d3b1 into Open-Wine-Components:main Apr 17, 2024
4 checks passed
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