Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10893367
D7280.id.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
10 KB
Referenced Files
None
Subscribers
None
D7280.id.diff
View Options
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 <Staudi.Kaos@gmail.com>
+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 @@
<Files>
<Path fileType="executable">/usr/bin/lutris</Path>
<Path fileType="executable">/usr/bin/lutris-wrapper</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/PKG-INFO</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/SOURCES.txt</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/dependency_links.txt</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/not-zip-safe</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/requires.txt</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.2.2-py3.6.egg-info/top_level.txt</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/PKG-INFO</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/SOURCES.txt</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/dependency_links.txt</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/not-zip-safe</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/requires.txt</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris-0.5.3-py3.6.egg-info/top_level.txt</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__init__.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/__init__.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/api.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/cache.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/command.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/config.cpython-36.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/discord.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/exceptions.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/game.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/__pycache__/game_actions.cpython-36.pyc</Path>
@@ -47,6 +48,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/cache.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/command.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/config.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris/discord.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/exceptions.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/game.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/game_actions.py</Path>
@@ -270,6 +272,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/fileio.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/gamecontrollerdb.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/http.cpython-36.pyc</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/i18n.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/jobs.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/joypad.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/keyring.cpython-36.pyc</Path>
@@ -280,7 +283,6 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/process.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/resources.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/settings.cpython-36.pyc</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/signals.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/sql.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/strings.cpython-36.pyc</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/__pycache__/system.cpython-36.pyc</Path>
@@ -307,6 +309,7 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/graphics/glxinfo.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/graphics/vkquery.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/http.py</Path>
+ <Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/i18n.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/jobs.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/joypad.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/keyring.py</Path>
@@ -317,7 +320,6 @@
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/process.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/resources.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/settings.py</Path>
- <Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/signals.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/sql.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/steam/__init__.py</Path>
<Path fileType="library">/usr/lib/python3.6/site-packages/lutris/util/steam/__pycache__/__init__.cpython-36.pyc</Path>
@@ -510,12 +512,12 @@
</Files>
</Package>
<History>
- <Update release="40">
- <Date>2019-09-11</Date>
- <Version>0.5.2.2</Version>
+ <Update release="41">
+ <Date>2019-09-30</Date>
+ <Version>0.5.3</Version>
<Comment>Packaging update</Comment>
<Name>Thomas Staudinger</Name>
<Email>Staudi.Kaos@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Jul 1 2023, 6:46 PM (5 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5803742
Default Alt Text
D7280.id.diff (10 KB)
Attached To
Mode
D7280: Update Lutris to 0.5.3
Attached
Detach File
Event Timeline
Log In to Comment