Gentoo Archives: gentoo-commits

From: Andrew Ammerlaan <andrewammerlaan@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/
Date: Sat, 28 Jan 2023 10:02:00
Message-Id: 1674900097.a1e58c8f1e9b34d8f7b76969a4df5a33e2a47bf9.andrewammerlaan@gentoo
1 commit: a1e58c8f1e9b34d8f7b76969a4df5a33e2a47bf9
2 Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jan 28 10:00:34 2023 +0000
4 Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
5 CommitDate: Sat Jan 28 10:01:37 2023 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e58c8f
7
8 games-util/lutris: update 9999 ebuild in preparation of 0.5.13 release
9
10 Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
11
12 .../lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch | 17 +++++++++++++++++
13 games-util/lutris/lutris-9999.ebuild | 18 ++++++++++++++----
14 2 files changed, 31 insertions(+), 4 deletions(-)
15
16 diff --git a/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
17 new file mode 100644
18 index 000000000000..9685a826878b
19 --- /dev/null
20 +++ b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
21 @@ -0,0 +1,17 @@
22 +diff --git a/lutris/gui/dialogs/webconnect_dialog.py b/lutris/gui/dialogs/webconnect_dialog.py
23 +index 12fbbdc..a6cd838 100644
24 +--- a/lutris/gui/dialogs/webconnect_dialog.py
25 ++++ b/lutris/gui/dialogs/webconnect_dialog.py
26 +@@ -3,7 +3,11 @@ import os
27 + from gettext import gettext as _
28 +
29 + import gi
30 +-gi.require_version("WebKit2", "4.0")
31 ++try:
32 ++ gi.require_version("WebKit2", "4.1")
33 ++except (ImportError, ValueError):
34 ++ gi.require_version("WebKit2", "4.0")
35 ++
36 + from gi.repository import WebKit2
37 +
38 + from lutris.gui.dialogs import ModalDialog
39
40 diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
41 index e1ea8bd1147a..0b268cfd6c78 100644
42 --- a/games-util/lutris/lutris-9999.ebuild
43 +++ b/games-util/lutris/lutris-9999.ebuild
44 @@ -5,7 +5,8 @@ EAPI=8
45
46 PYTHON_COMPAT=( python3_{9..11} )
47 PYTHON_REQ_USE="sqlite,threads(+)"
48 -DISTUTILS_SINGLE_IMPL="1"
49 +DISTUTILS_SINGLE_IMPL=1
50 +DISTUTILS_USE_PEP517=setuptools
51
52 inherit distutils-r1 optfeature virtualx xdg
53
54 @@ -34,18 +35,23 @@ RDEPEND="
55 app-arch/p7zip
56 app-arch/unzip
57 $(python_gen_cond_dep '
58 + dev-python/certifi[${PYTHON_USEDEP}]
59 dev-python/dbus-python[${PYTHON_USEDEP}]
60 dev-python/distro[${PYTHON_USEDEP}]
61 dev-python/lxml[${PYTHON_USEDEP}]
62 dev-python/pillow[${PYTHON_USEDEP}]
63 dev-python/pygobject:3[${PYTHON_USEDEP}]
64 + dev-python/pypresence[${PYTHON_USEDEP}]
65 dev-python/python-evdev[${PYTHON_USEDEP}]
66 - dev-python/python-magic[${PYTHON_USEDEP}]
67 dev-python/pyyaml[${PYTHON_USEDEP}]
68 dev-python/requests[${PYTHON_USEDEP}]
69 + dev-python/moddb[${PYTHON_USEDEP}]
70 ')
71 media-sound/fluid-soundfont
72 - net-libs/webkit-gtk:4.1[introspection]
73 + || (
74 + net-libs/webkit-gtk:4[introspection]
75 + net-libs/webkit-gtk:4.1[introspection]
76 + )
77 x11-apps/mesa-progs
78 x11-apps/xgamma
79 x11-apps/xrandr
80 @@ -57,6 +63,10 @@ distutils_enable_tests pytest
81
82 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
83
84 +PATCHES=(
85 + "${FILESDIR}/${PN}-0.5.13-webkit-gtk-4-1.patch"
86 +)
87 +
88 python_test() {
89 virtx epytest
90 }
91 @@ -69,7 +79,7 @@ python_install_all() {
92 pkg_postinst() {
93 xdg_pkg_postinst
94
95 - optfeature "running windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader
96 + optfeature "running MS Windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader
97
98 # Quote README.rst
99 elog ""