search

RobLoach / net.lutris.Lutris

Pull requests for new applications to be added
https://flathub.org
2 stars 0 forks source link

Update to Lutris 0.5.2 #32

Closed RobLoach closed 5 years ago

RobLoach commented 5 years ago

Lutris 0.5.2 is out. This allows removal of one of the manually maintained patches: https://github.com/lutris/lutris/pull/1977

RobLoach commented 5 years ago

The other patch will need to be updated before we merge this one.

RobLoach commented 5 years ago

Mind testing this?

gasinvein commented 5 years ago

@RobLoach Updated in what way? It applies just fine, Lutris is able to launch Steam games.

RobLoach commented 5 years ago

The patch wasn't applying against 0.5.2, so I updated the diff....

➜  lutris git:(master) git checkout v0.5.2
➜  lutris git:(8bacffa) wget https://raw.githubusercontent.com/RobLoach/net.lutris.Lutris/net.lutris.Lutris/patches/0002-Use-xdg-open-to-run-Steam-games-if-running-in-flatpa.patch
➜  lutris git:(8bacffa) ✗ git apply 0002-Use-xdg-open-to-run-Steam-games-if-running-in-flatpa.patch
error: patch failed: lutris/util/linux.py:104
error: lutris/util/linux.py: patch does not apply

With the updated diff, it applies cleanly now.

gasinvein commented 5 years ago

Strange, it did work for me in flatpak-builder, just with some fuzz:

Applying patch 0001-Use-xdg-open-to-run-Steam-games-if-running-in-flatpa.patch
patching file lutris/runners/steam.py
Hunk #1 succeeded at 189 (offset 1 line).
Hunk #2 succeeded at 212 (offset 1 line).
Hunk #3 succeeded at 329 (offset 6 lines).
patching file lutris/util/linux.py
Hunk #1 succeeded at 108 with fuzz 2 (offset 4 lines).
Hunk #2 succeeded at 206 with fuzz 1 (offset 4 lines).
RobLoach commented 5 years ago

Thanks for trying a build! :+1: