Gentoo Archives: gentoo-commits

From: Stefan Strogin <steils@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/lutris/, games-util/lutris/files/
Date: Thu, 02 Jan 2020 02:28:10
Message-Id: 1577931932.3e758a76a1ecef8d224e11a208db33f6f69b9451.steils@gentoo
1 commit: 3e758a76a1ecef8d224e11a208db33f6f69b9451
2 Author: Stefan Strogin <steils <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jan 2 02:21:39 2020 +0000
4 Commit: Stefan Strogin <steils <AT> gentoo <DOT> org>
5 CommitDate: Thu Jan 2 02:25:32 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e758a76
7
8 games-util/lutris: add patch to fix issue with x11-libs/gtk+-3.24.13
9
10 Reported-by: Marcin Woźniak <y0rune <AT> aol.com>
11 Closes: https://bugs.gentoo.org/704130
12 Package-Manager: Portage-2.3.84, Repoman-2.3.20
13 Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>
14
15 games-util/lutris/files/lutris-0.5.4-gtk.patch | 29 ++++++++++++++++++++++
16 ...{lutris-0.5.4.ebuild => lutris-0.5.4-r1.ebuild} | 4 ++-
17 2 files changed, 32 insertions(+), 1 deletion(-)
18
19 diff --git a/games-util/lutris/files/lutris-0.5.4-gtk.patch b/games-util/lutris/files/lutris-0.5.4-gtk.patch
20 new file mode 100644
21 index 00000000000..a2c5d71d998
22 --- /dev/null
23 +++ b/games-util/lutris/files/lutris-0.5.4-gtk.patch
24 @@ -0,0 +1,29 @@
25 +From a97150b78954e176cb0f825f0c201f54d5da613e Mon Sep 17 00:00:00 2001
26 +From: Stefan Strogin <steils@g.o>
27 +Date: Tue, 31 Dec 2019 03:22:26 +0200
28 +Subject: [PATCH] Call the correct method for creating TreeModelSort (Closes
29 + #2554)
30 +
31 +Upstream-Status: Accepted
32 +[https://github.com/lutris/lutris/commit/a99b17f00dfc4cdab80c237752cc3167d64194eb]
33 +Signed-off-by: Stefan Strogin <steils@g.o>
34 +---
35 + lutris/gui/views/store.py | 2 +-
36 + 1 file changed, 1 insertion(+), 1 deletion(-)
37 +
38 +diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py
39 +index ba331313..4d5f372e 100644
40 +--- a/lutris/gui/views/store.py
41 ++++ b/lutris/gui/views/store.py
42 +@@ -130,7 +130,7 @@ class GameStore(GObject.Object):
43 + self.prevent_sort_update = False # prevent recursion with signals
44 + self.modelfilter = self.store.filter_new()
45 + self.modelfilter.set_visible_func(self.filter_view)
46 +- self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter)
47 ++ self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter)
48 + self.modelsort.connect("sort-column-changed", self.on_sort_column_changed)
49 + self.modelsort.set_sort_func(sort_col, sort_func, sort_col)
50 + self.sort_view(sort_key, sort_ascending)
51 +--
52 +2.24.1
53 +
54
55 diff --git a/games-util/lutris/lutris-0.5.4.ebuild b/games-util/lutris/lutris-0.5.4-r1.ebuild
56 similarity index 95%
57 rename from games-util/lutris/lutris-0.5.4.ebuild
58 rename to games-util/lutris/lutris-0.5.4-r1.ebuild
59 index 7eb0bd47ed1..e84a2566047 100644
60 --- a/games-util/lutris/lutris-0.5.4.ebuild
61 +++ b/games-util/lutris/lutris-0.5.4-r1.ebuild
62 @@ -1,4 +1,4 @@
63 -# Copyright 1999-2019 Gentoo Authors
64 +# Copyright 1999-2020 Gentoo Authors
65 # Distributed under the terms of the GNU General Public License v2
66
67 EAPI=7
68 @@ -49,6 +49,8 @@ RDEPEND="
69 x11-libs/libnotify
70 "
71
72 +PATCHES=( "${FILESDIR}/${P}-gtk.patch" )
73 +
74 python_install_all() {
75 local DOCS=( AUTHORS README.rst docs/installers.rst )
76 distutils-r1_python_install_all