diff --git a/files/0002-Revert-Reorder-iter_lib_folders-for-gentoo.patch b/files/0002-Revert-Reorder-iter_lib_folders-for-gentoo.patch new file mode 100644 --- /dev/null +++ b/files/0002-Revert-Reorder-iter_lib_folders-for-gentoo.patch @@ -0,0 +1,48 @@ +From 0f433f49f5b8362f2fc9121c1e5e2973eaa4dbc8 Mon Sep 17 00:00:00 2001 +From: Thomas Staudinger +Date: Mon, 30 Sep 2019 20:20:27 +0200 +Subject: [PATCH] Revert "Reorder iter_lib_folders() for gentoo." + +This reverts commit 8a9bec84ed48332120692827005604d963db31a0 (breaks Wine launchers) +--- + lutris/util/linux.py | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/lutris/util/linux.py b/lutris/util/linux.py +index 13cf7065..448d4402 100644 +--- a/lutris/util/linux.py ++++ b/lutris/util/linux.py +@@ -277,9 +277,6 @@ class LinuxSystem: + def iter_lib_folders(self): + """Loop over existing 32/64 bit library folders""" + exported_lib_folders = set() +- for lib_folder in self.get_lib_folders(): +- exported_lib_folders.add(lib_folder) +- yield lib_folder + for lib_paths in self.multiarch_lib_folders: + if self.arch != 'x86_64': + # On non amd64 setups, only the first element is relevant +@@ -289,12 +286,14 @@ class LinuxSystem: + if os.path.realpath(lib_paths[0]) == os.path.realpath(lib_paths[1]): + continue + if all([os.path.exists(path) for path in lib_paths]): +- if lib_paths[0] not in exported_lib_folders: +- yield lib_paths[0] +- if len(lib_paths) != 1: +- if lib_paths[1] not in exported_lib_folders: +- yield lib_paths[1] +- ++ exported_lib_folders.add(lib_paths[0]) ++ yield lib_paths[0] ++ exported_lib_folders.add(lib_paths[1]) ++ yield lib_paths[1] ++ for lib_folder in self.get_lib_folders(): ++ if lib_folder not in exported_lib_folders: ++ yield lib_folder ++ + def get_ldconfig_libs(self): + """Return a list of available libraries, as returned by `ldconfig -p`.""" + ldconfig = self.get("ldconfig") +-- +2.23.0 + diff --git a/package.yml b/package.yml --- a/package.yml +++ b/package.yml @@ -1,8 +1,8 @@ name : lutris -version : 0.5.2.2 -release : 40 +version : 0.5.3 +release : 41 source : - - https://github.com/lutris/lutris/archive/0.5.2.2.tar.gz : 09ed6bbc501610c4bdc3653b8b9f9bfde1ae797dae29e69a2f4a4b75da337376 + - https://github.com/lutris/lutris/archive/v0.5.3.tar.gz : 673d2cfae1f427ad87df0bd69decc1aab07f3cd22476f4b74501d88398b58687 license : GPL-3.0-or-later component : games summary : Install and play any video game easily @@ -20,6 +20,7 @@ - pyyaml setup : | %patch -p1 < $pkgfiles/0001-Remove-prompt-for-donation-that-also-opens-up-the-do.patch + %patch -p1 < $pkgfiles/0002-Revert-Reorder-iter_lib_folders-for-gentoo.patch build : | %python3_setup install : | diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml --- a/pspec_x86_64.xml +++ b/pspec_x86_64.xml @@ -21,18 +21,19 @@ /usr/bin/lutris /usr/bin/lutris-wrapper - /usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/PKG-INFO - /usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/SOURCES.txt - /usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/dependency_links.txt - /usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/not-zip-safe - /usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/requires.txt - /usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/top_level.txt + /usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/PKG-INFO + /usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/SOURCES.txt + /usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/dependency_links.txt + /usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/not-zip-safe + /usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/requires.txt + /usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/top_level.txt /usr/lib/python3.6/site-packages/lutris/__init__.py /usr/lib/python3.6/site-packages/lutris/__pycache__/__init__.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/__pycache__/api.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/__pycache__/cache.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/__pycache__/command.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/__pycache__/config.cpython-36.pyc + /usr/lib/python3.6/site-packages/lutris/__pycache__/discord.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/__pycache__/exceptions.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/__pycache__/game.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/__pycache__/game_actions.cpython-36.pyc @@ -47,6 +48,7 @@ /usr/lib/python3.6/site-packages/lutris/cache.py /usr/lib/python3.6/site-packages/lutris/command.py /usr/lib/python3.6/site-packages/lutris/config.py + /usr/lib/python3.6/site-packages/lutris/discord.py /usr/lib/python3.6/site-packages/lutris/exceptions.py /usr/lib/python3.6/site-packages/lutris/game.py /usr/lib/python3.6/site-packages/lutris/game_actions.py @@ -270,6 +272,7 @@ /usr/lib/python3.6/site-packages/lutris/util/__pycache__/fileio.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/gamecontrollerdb.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/http.cpython-36.pyc + /usr/lib/python3.6/site-packages/lutris/util/__pycache__/i18n.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/jobs.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/joypad.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/keyring.cpython-36.pyc @@ -280,7 +283,6 @@ /usr/lib/python3.6/site-packages/lutris/util/__pycache__/process.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/resources.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/settings.cpython-36.pyc - /usr/lib/python3.6/site-packages/lutris/util/__pycache__/signals.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/sql.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/strings.cpython-36.pyc /usr/lib/python3.6/site-packages/lutris/util/__pycache__/system.cpython-36.pyc @@ -307,6 +309,7 @@ /usr/lib/python3.6/site-packages/lutris/util/graphics/glxinfo.py /usr/lib/python3.6/site-packages/lutris/util/graphics/vkquery.py /usr/lib/python3.6/site-packages/lutris/util/http.py + /usr/lib/python3.6/site-packages/lutris/util/i18n.py /usr/lib/python3.6/site-packages/lutris/util/jobs.py /usr/lib/python3.6/site-packages/lutris/util/joypad.py /usr/lib/python3.6/site-packages/lutris/util/keyring.py @@ -317,7 +320,6 @@ /usr/lib/python3.6/site-packages/lutris/util/process.py /usr/lib/python3.6/site-packages/lutris/util/resources.py /usr/lib/python3.6/site-packages/lutris/util/settings.py - /usr/lib/python3.6/site-packages/lutris/util/signals.py /usr/lib/python3.6/site-packages/lutris/util/sql.py /usr/lib/python3.6/site-packages/lutris/util/steam/__init__.py /usr/lib/python3.6/site-packages/lutris/util/steam/__pycache__/__init__.cpython-36.pyc @@ -510,12 +512,12 @@ - - 2019-09-11 - 0.5.2.2 + + 2019-09-30 + 0.5.3 Packaging update Thomas Staudinger Staudi.Kaos@gmail.com \ No newline at end of file