Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/
Date: Fri, 11 Sep 2020 08:09:10
Message-Id: 1599811739.29b588944a03fb6f123226952666c5b0a3f99d86.polynomial-c@gentoo
1 commit: 29b588944a03fb6f123226952666c5b0a3f99d86
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Sep 11 08:04:55 2020 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Sep 11 08:08:59 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=29b58894
7
8 games-util/lutris: Bump to version 0.5.7.1
9
10 Converted to only use a single python implementation in order to
11 avoid bug #740048
12
13 Thanks-to: Arfrever Frehtes Taifersar Arahesis <Arfrever <AT> Apache.Org>
14
15 Closes: https://bugs.gentoo.org/733828
16 Closes: https://bugs.gentoo.org/740048
17 Package-Manager: Portage-3.0.6, Repoman-3.0.1
18 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
19
20 games-util/lutris/Manifest | 1 +
21 .../lutris/files/lutris-0.5.7-copy_paste_fix.patch | 38 ++++++++++
22 games-util/lutris/lutris-0.5.7.1.ebuild | 82 ++++++++++++++++++++++
23 3 files changed, 121 insertions(+)
24
25 diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
26 index 0e52c75c49c..678e040beda 100644
27 --- a/games-util/lutris/Manifest
28 +++ b/games-util/lutris/Manifest
29 @@ -1,3 +1,4 @@
30 DIST lutris_0.5.4.tar.xz 1843880 BLAKE2B f286d62df3bf5a5eadd634d2d177a5b69b5fa5d897e70f58a19be4148609e56ba33c29ce4218ae833dbdf9dded1e9be869f9ed4d84ba2b435a09981219d74438 SHA512 81669f2021063229bad78ebc49b54075058266716279695c53c43a5a06a8c1d4e5a9dcbcb20a1becfe0d243aa6e812f5a30b4d90f418d4cffcff18daefb09c50
31 DIST lutris_0.5.6.tar.xz 1747440 BLAKE2B e39206d8245d99a0424537cd9d9ed860c4e0d9fd373afe61d7e19eb2672bee621d541060af74f1197242e49a846e70fe16eb28e0c57370d2e11634d7035ab1fe SHA512 3ac9f7095c30044990e42f671d6e1e5cac6cd921cdf93e175400335cb6e9ae5b1bf8101dc0805838f3c5bf9713b891c62960c80a1a20aef1e4f896a74af97a01
32 +DIST lutris_0.5.7.1.tar.xz 2145584 BLAKE2B eb766d5e36aca63af7af8f2e85f51b4e3e37b8372b13a59702c545a0c697fa5feb1403cd9589d22c2bdff6593f69ed39e1bcb7ecb28ecc24b7a77b09ed1b2f89 SHA512 9efff4d92ae4d9051a7253324047dfa57f463188ebdbcede5feba2c0268494e8fa7929d2ef30bfe85e52824bbb9c05b1f1688b6658376597cc4cc35c26a19da3
33 DIST lutris_0.5.7.tar.xz 2133524 BLAKE2B d27191668f582a5cd50941ca227d6121f1bfdb4824c490dd54cc513fda523712af9480451b0e5503404aba8d083c94ce91b928ed3faf4e94ea9f0bbf28b764c1 SHA512 f751be82dd5550dc882932980a3a04a62f183e5f0dddc9939154025408da081392917834324875a80ae8b354906e04835c2df56c23f1d6d29cd9fbdc514e1c57
34
35 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
36 new file mode 100644
37 index 00000000000..3e278561aa3
38 --- /dev/null
39 +++ b/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
40 @@ -0,0 +1,38 @@
41 +From 9603da9d4eda1656219a4c79e1f9d1a958165151 Mon Sep 17 00:00:00 2001
42 +From: Austin Pua <pua.austin.anderson@×××××.com>
43 +Date: Wed, 1 Jul 2020 21:48:09 +0800
44 +Subject: [PATCH] Fix copy paste issue in auth webviews
45 +
46 +---
47 + lutris/services/gog.py | 3 ++-
48 + lutris/services/humblebundle.py | 3 ++-
49 + 2 files changed, 4 insertions(+), 2 deletions(-)
50 +
51 +diff --git a/lutris/services/gog.py b/lutris/services/gog.py
52 +index 0eed7778c..099f9083d 100644
53 +--- a/lutris/services/gog.py
54 ++++ b/lutris/services/gog.py
55 +@@ -279,7 +279,8 @@ def connect(parent=None):
56 + """Connect to GOG"""
57 + logger.debug("Connecting to GOG")
58 + dialog = WebConnectDialog(SERVICE, parent)
59 +- dialog.run()
60 ++ dialog.set_modal(True)
61 ++ dialog.show()
62 +
63 +
64 + def disconnect():
65 +diff --git a/lutris/services/humblebundle.py b/lutris/services/humblebundle.py
66 +index 6dcfe6911..056ef9460 100644
67 +--- a/lutris/services/humblebundle.py
68 ++++ b/lutris/services/humblebundle.py
69 +@@ -152,7 +152,8 @@ def is_connected():
70 + def connect(parent=None):
71 + """Connect to Humble Bundle"""
72 + dialog = WebConnectDialog(SERVICE, parent)
73 +- dialog.run()
74 ++ dialog.set_modal(True)
75 ++ dialog.show()
76 +
77 +
78 + def disconnect():
79
80 diff --git a/games-util/lutris/lutris-0.5.7.1.ebuild b/games-util/lutris/lutris-0.5.7.1.ebuild
81 new file mode 100644
82 index 00000000000..fb54a72d2b4
83 --- /dev/null
84 +++ b/games-util/lutris/lutris-0.5.7.1.ebuild
85 @@ -0,0 +1,82 @@
86 +# Copyright 1999-2020 Gentoo Authors
87 +# Distributed under the terms of the GNU General Public License v2
88 +
89 +EAPI=7
90 +
91 +PYTHON_COMPAT=( python3_{6,7,8} )
92 +PYTHON_REQ_USE="sqlite,threads(+)"
93 +DISTUTILS_SINGLE_IMPL="1"
94 +
95 +inherit distutils-r1 virtualx xdg
96 +
97 +DESCRIPTION="An open source gaming platform for GNU/Linux"
98 +HOMEPAGE="https://lutris.net/"
99 +
100 +if [[ ${PV} == *9999* ]] ; then
101 + EGIT_REPO_URI="https://github.com/lutris/lutris.git"
102 + inherit git-r3
103 +else
104 + SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
105 + KEYWORDS="~amd64 ~x86"
106 + S="${WORKDIR}/${PN}"
107 +fi
108 +
109 +LICENSE="GPL-3"
110 +SLOT="0"
111 +
112 +RESTRICT="!test? ( test )"
113 +
114 +BDEPEND="
115 + test? (
116 + $(python_gen_cond_dep '
117 + dev-python/nose[${PYTHON_USEDEP}]
118 + ')
119 + )
120 +"
121 +RDEPEND="
122 + app-arch/cabextract
123 + app-arch/p7zip
124 + app-arch/unrar
125 + app-arch/unzip
126 + $(python_gen_cond_dep '
127 + dev-python/dbus-python[${PYTHON_USEDEP}]
128 + dev-python/pillow[${PYTHON_USEDEP}]
129 + dev-python/pygobject:3[${PYTHON_USEDEP}]
130 + dev-python/python-evdev[${PYTHON_USEDEP}]
131 + dev-python/pyyaml[${PYTHON_USEDEP}]
132 + dev-python/requests[${PYTHON_USEDEP}]
133 + ')
134 + gnome-base/gnome-desktop:3[introspection]
135 + media-sound/fluid-soundfont
136 + net-libs/libsoup
137 + net-libs/webkit-gtk:4[introspection]
138 + x11-apps/mesa-progs
139 + x11-apps/xgamma
140 + x11-apps/xrandr
141 + x11-libs/gtk+:3[introspection]
142 + x11-libs/libnotify
143 +"
144 +
145 +PATCHES=(
146 + "${FILESDIR}/${PN}-0.5.7-copy_paste_fix.patch"
147 +)
148 +
149 +python_install_all() {
150 + local DOCS=( AUTHORS README.rst docs/installers.rst )
151 + distutils-r1_python_install_all
152 + python_fix_shebang "${ED}"/usr/share/lutris/bin/lutris-wrapper #740048
153 +}
154 +
155 +python_test() {
156 + virtx nosetests -v
157 +}
158 +
159 +pkg_postinst() {
160 + xdg_pkg_postinst
161 +
162 + # Quote README.rst
163 + elog "Lutris installations are fully automated through scripts, which can"
164 + elog "be written in either JSON or YAML. The scripting syntax is described"
165 + elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
166 + elog "available online at lutris.net."
167 +}