forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
games-util/lutris: fix use of system wine
Bug: https://bugs.gentoo.org/911245 Signed-off-by: Andrew Ammerlaan <[email protected]>
- Loading branch information
1 parent
096b117
commit 3627403
Showing
2 changed files
with
26 additions
and
0 deletions.
There are no files selected for viewing
22 changes: 22 additions & 0 deletions
22
games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
diff --git a/lutris/util/wine/wine.py b/lutris/util/wine/wine.py | ||
index f84584b..fa36d0c 100644 | ||
--- a/lutris/util/wine/wine.py | ||
+++ b/lutris/util/wine/wine.py | ||
@@ -19,7 +19,7 @@ WINE_PATHS = { | ||
"winehq-devel": "/opt/wine-devel/bin/wine", | ||
"winehq-staging": "/opt/wine-staging/bin/wine", | ||
"wine-development": "/usr/lib/wine-development/wine", | ||
- "system": "wine", | ||
+ "system": "/etc/eselect/wine/bin/wine", | ||
} | ||
|
||
ESYNC_LIMIT_CHECK = os.environ.get("ESYNC_LIMIT_CHECK", "").lower() | ||
@@ -273,7 +273,7 @@ def get_wine_version(wine_path="wine"): | ||
return | ||
if wine_path == "wine" and not system.find_executable("wine"): | ||
return | ||
- if os.path.isabs(wine_path): | ||
+ if os.path.isabs(wine_path) and not os.path.islink(wine_path): | ||
wine_stats = os.stat(wine_path) | ||
if wine_stats.st_size < 2000: | ||
# This version is a script, ignore it |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters