gentoo resync : 16.09.2020

2 files changed, 38 insertions, 29 deletions

diff --git a/games-util/lutris/files/lutris-0.5.4-gtk.patch b/games-util/lutris/files/lutris-0.5.4-gtk.patch
deleted file mode 100644
index a2c5d71d9982..000000000000
--- a/games-util/lutris/files/lutris-0.5.4-gtk.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-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
-
diff --git a/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch b/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
new file mode 100644
index 000000000000..3e278561aa3b
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
@@ -0,0 +1,38 @@
+From 9603da9d4eda1656219a4c79e1f9d1a958165151 Mon Sep 17 00:00:00 2001
+From: Austin Pua <pua.austin.anderson@gmail.com>
+Date: Wed, 1 Jul 2020 21:48:09 +0800
+Subject: [PATCH] Fix copy paste issue in auth webviews
+
+---
+ lutris/services/gog.py          | 3 ++-
+ lutris/services/humblebundle.py | 3 ++-
+ 2 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/lutris/services/gog.py b/lutris/services/gog.py
+index 0eed7778c..099f9083d 100644
+--- a/lutris/services/gog.py
++++ b/lutris/services/gog.py
+@@ -279,7 +279,8 @@ def connect(parent=None):
+     """Connect to GOG"""
+     logger.debug("Connecting to GOG")
+     dialog = WebConnectDialog(SERVICE, parent)
+-    dialog.run()
++    dialog.set_modal(True)
++    dialog.show()
+ 
+ 
+ def disconnect():
+diff --git a/lutris/services/humblebundle.py b/lutris/services/humblebundle.py
+index 6dcfe6911..056ef9460 100644
+--- a/lutris/services/humblebundle.py
++++ b/lutris/services/humblebundle.py
+@@ -152,7 +152,8 @@ def is_connected():
+ def connect(parent=None):
+     """Connect to Humble Bundle"""
+     dialog = WebConnectDialog(SERVICE, parent)
+-    dialog.run()
++    dialog.set_modal(True)
++    dialog.show()
+ 
+ 
+ def disconnect():