Remove bundled winetricks

This commit is contained in:
Mathieu Comandon 2020-01-05 16:00:25 -08:00
parent df3a041458
commit bf0888dced
4 changed files with 8 additions and 22316 deletions

View file

@ -25,9 +25,6 @@ pgp-renew:
osc signkey --extend home:strycore
osc rebuildpac home:strycore --all
update-winetricks:
wget https://raw.githubusercontent.com/Winetricks/winetricks/master/src/winetricks -O share/lutris/bin/winetricks
changelog-add:
dch -i

25
debian/copyright vendored
View file

@ -23,31 +23,6 @@ Files: lutris/services/tosec.py
Copyright: 2013 Adrien Plazas
License: GPL-3
Files: share/lutris/bin/winetricks
Copyright: 2007-2014 Dan Kegel <dank@kegel.com>
2008-2019 Austin English <austinenglish@gmail.com>
2010-2011 Phil Blankenship <phillip.e.blankenship@gmail.com>
2010-2015 Shannon VanWagner <shannon.vanwagner@gmail.com>
2010 Belhorma Bendebiche <amro256@gmail.com>
2010 Eleazar Galano <eg.galano@gmail.com>
2010 Travis Athougies <iammisc@gmail.com>
2010 Andrew Nguyen
2010 Detlef Riekenberg
2010 Maarten Lankhorst
2010 Rico Schüller
2011 Scott Jackson <sjackson2@gmx.com>
2011 Trevor Johnson
2011 Franco Junio
2011 Craig Sanders
2011 Matthew Bauer <mjbauer95@gmail.com>
2011 Giuseppe Dia
2011 Łukasz Wojniłowicz
2011 Matthew Bozarth
2013-2017 Andrey Gusev <andrey.goosev@gmail.com>
2013-2017 Hillwood Yang <hillwood@opensuse.org>
2013,2016 André Hentschel <nerv@dawncrow.de>
License: LGPL-2.1
Files: share/metainfo/net.lutris.Lutris.metainfo.xml
Copyright: Lutris Team <strider@lutris.net>
License: CC0-1.0

View file

@ -338,16 +338,14 @@ def winetricks(
):
"""Execute winetricks."""
wine_config = config or LutrisConfig(runner_slug="wine")
system_winetricks = wine_config.runner_config.get("system_winetricks")
if system_winetricks:
winetricks_path = "/usr/bin/winetricks"
else:
winetricks_path = os.path.join(settings.RUNTIME_DIR, "winetricks/winetricks")
if not system.path_exists(winetricks_path):
logger.warning(
"Could not find local winetricks install, falling back to bundled version"
)
winetricks_path = os.path.join(datapath.get(), "bin/winetricks")
winetricks_path = os.path.join(settings.RUNTIME_DIR, "winetricks/winetricks")
if (
wine_config.runner_config.get("system_winetricks")
or not system.path_exists(winetricks_path)
):
winetricks_path = system.find_executable("winetricks")
if not winetricks_path:
raise RuntimeError("No installation of winetricks found")
if wine_path:
winetricks_wine = wine_path
else:

File diff suppressed because it is too large Load diff