Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / lutris
Commits: 48c116c4 by Robin Candau at 2024-10-07T00:00:10+02:00 upgpkg: 0.5.17-6: Add a temporary patch to fix the umu launcher integration See https://github.com/lutris/lutris/issues/5639 & https://github.com/lutris/lutris/commit/3ec23ac521871e2ba648d64a7734cfc78eb8b9bc Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/lutris/-/issues/3 - - - - - 3 changed files: - .SRCINFO - PKGBUILD - + fix_umu_launcher_integration.patch Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = lutris pkgdesc = Open Gaming Platform pkgver = 0.5.17 - pkgrel = 5 + pkgrel = 6 url = https://lutris.net arch = any license = GPL-3.0-only @@ -58,6 +58,8 @@ pkgbase = lutris optdepends = wine: Windows support optdepends = xorg-xgamma: Restore gamma on game exit source = git+https://github.com/lutris/lutris.git#tag=v0.5.17 + source = fix_umu_launcher_integration.patch sha256sums = fd80281d0bc0e0b3f077184313bb774d93309c32b93d8591da9fb05ec757d2ce + sha256sums = 790c592dd186432c208915bea986351cb8ea50bf85fc67e77100dbdd091300a0 pkgname = lutris ===================================== PKGBUILD ===================================== @@ -5,7 +5,7 @@ pkgname=lutris pkgver=0.5.17 -pkgrel=5 +pkgrel=6 pkgdesc='Open Gaming Platform' arch=(any) url=https://lutris.net @@ -70,8 +70,17 @@ optdepends=( 'wine: Windows support' 'xorg-xgamma: Restore gamma on game exit' ) -source=("git+https://github.com/lutris/lutris.git#tag=v${pkgver}";) -sha256sums=('fd80281d0bc0e0b3f077184313bb774d93309c32b93d8591da9fb05ec757d2ce') +source=("git+https://github.com/lutris/lutris.git#tag=v${pkgver}"; + "fix_umu_launcher_integration.patch") +sha256sums=('fd80281d0bc0e0b3f077184313bb774d93309c32b93d8591da9fb05ec757d2ce' + '790c592dd186432c208915bea986351cb8ea50bf85fc67e77100dbdd091300a0') + +prepare() { + cd lutris + # Temporary patch to fix the umu launcher integration + # See https://github.com/lutris/lutris/issues/5639 & https://github.com/lutris/lutris/commit/3ec23ac521871e2ba648d64a7734cfc78eb8b9bc + patch -Np1 < "${srcdir}/fix_umu_launcher_integration.patch" +} build() { arch-meson lutris build ===================================== fix_umu_launcher_integration.patch ===================================== @@ -0,0 +1,43 @@ +diff --git a/lutris/util/wine/proton.py b/lutris/util/wine/proton.py +index 4a0b46b..f55c37c 100644 +--- a/lutris/util/wine/proton.py ++++ b/lutris/util/wine/proton.py +@@ -18,11 +18,21 @@ def is_proton_path(wine_path) -> bool: + + + def get_umu_path() -> Optional[str]: ++ ++ # We can access Umu via it's main .py file, or via the public name which is just ++ # symbolic link to the same file. We'll check both for compatibility, just in case ++ # Umu gets translated into Perl or something. ++ entry_points = ["umu_run.py", "umu-run"] ++ + custom_path = settings.read_setting("umu_path") + if custom_path: +- script_path = os.path.join(custom_path, "umu_run.py") +- if system.path_exists(script_path): +- return script_path ++ for entry_point in entry_points: ++ entry_path = os.path.join(custom_path, entry_point) ++ if system.path_exists(entry_path): ++ return entry_path ++ ++ # We only use 'umu-run' when searching the path since that's the command ++ # line entry point. + if system.can_find_executable("umu-run"): + return system.find_executable("umu-run") + path_candidates = ( +@@ -33,9 +43,10 @@ def get_umu_path() -> Optional[str]: + settings.RUNTIME_DIR, + ) + for path_candidate in path_candidates: +- script_path = os.path.join(path_candidate, "umu", "umu_run.py") +- if system.path_exists(script_path): +- return script_path ++ for entry_point in entry_points: ++ entry_path = os.path.join(path_candidate, "umu", entry_point) ++ if system.path_exists(entry_path): ++ return entry_path + return None + + View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/lutris/-/commit/48c116c4bae1dccbb7b764872915b4f3dce19711 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/lutris/-/commit/48c116c4bae1dccbb7b764872915b4f3dce19711 You're receiving this email because of your account on gitlab.archlinux.org.
