games-util/lutris : import from gentoo, cherry-pick fix for https://github.com/lutris/lutris/issues/2488

2 files changed, 68 insertions, 0 deletions

diff --git a/games-util/lutris/files/df3a041458d3f128f2b23837b52edbbafeec0bd2.diff b/games-util/lutris/files/df3a041458d3f128f2b23837b52edbbafeec0bd2.diff
new file mode 100644
index 00000000..019010fe
--- /dev/null
+++ b/games-util/lutris/files/df3a041458d3f128f2b23837b52edbbafeec0bd2.diff
@@ -0,0 +1,39 @@
+diff --git a/lutris/runners/wine.py b/lutris/runners/wine.py
+index 97126726a..f792451f2 100644
+--- a/lutris/runners/wine.py
++++ b/lutris/runners/wine.py
+@@ -743,6 +743,7 @@ def toggle_dxvk(self, enable, version=None, dxvk_manager: dxvk.DXVKManager = Non
+         if version.lower() != "manual":
+             if enable:
+                 if not dxvk_manager.is_available():
++                    logger.info("DXVK %s is not available yet, downloading...")
+                     dxvk_manager.download()
+                 dxvk_manager.enable()
+             else:
+diff --git a/lutris/util/downloader.py b/lutris/util/downloader.py
+index da8038cfd..8b96af80f 100644
+--- a/lutris/util/downloader.py
++++ b/lutris/util/downloader.py
+@@ -113,6 +113,9 @@ def async_download(self, stop_request=None):
+         if self.referer:
+             headers["Referer"] = self.referer
+         response = requests.get(self.url, headers=headers, stream=True)
++        if response.status_code != 200:
++            logger.info("%s returned a %s error" % (self.url, response.status_code))
++        response.raise_for_status()
+         self.full_size = int(response.headers.get("Content-Length", "").strip() or 0)
+         for chunk in response.iter_content(chunk_size=1024 * 1024):
+             if not self.file_pointer:
+diff --git a/lutris/util/extract.py b/lutris/util/extract.py
+index 4e05d9bdf..3bd78e5f3 100644
+--- a/lutris/util/extract.py
++++ b/lutris/util/extract.py
+@@ -113,7 +113,7 @@ def extract_archive(path, to_directory=".", merge_single=True, extractor=None):
+     try:
+         _do_extract(path, temp_path, opener, mode, extractor)
+     except (OSError, zlib.error, tarfile.ReadError, EOFError) as ex:
+-        logger.exception("Extraction failed: %s", ex)
++        logger.error("Extraction failed: %s", ex)
+         raise ExtractFailure(str(ex))
+     if merge_single:
+         extracted = os.listdir(temp_path)
diff --git a/games-util/lutris/files/lutris-0.5.4-gtk.patch b/games-util/lutris/files/lutris-0.5.4-gtk.patch
new file mode 100644
index 00000000..a2c5d71d
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.4-gtk.patch
@@ -0,0 +1,29 @@
+From a97150b78954e176cb0f825f0c201f54d5da613e Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Tue, 31 Dec 2019 03:22:26 +0200
+Subject: [PATCH] Call the correct method for creating TreeModelSort (Closes
+ #2554)
+
+Upstream-Status: Accepted
+[https://github.com/lutris/lutris/commit/a99b17f00dfc4cdab80c237752cc3167d64194eb]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ lutris/gui/views/store.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py
+index ba331313..4d5f372e 100644
+--- a/lutris/gui/views/store.py
++++ b/lutris/gui/views/store.py
+@@ -130,7 +130,7 @@ class GameStore(GObject.Object):
+         self.prevent_sort_update = False  # prevent recursion with signals
+         self.modelfilter = self.store.filter_new()
+         self.modelfilter.set_visible_func(self.filter_view)
+-        self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter)
++        self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter)
+         self.modelsort.connect("sort-column-changed", self.on_sort_column_changed)
+         self.modelsort.set_sort_func(sort_col, sort_func, sort_col)
+         self.sort_view(sort_key, sort_ascending)
+-- 
+2.24.1
+