From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2A94C158010 for ; Sat, 28 Jan 2023 10:02:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 21F18E085E; Sat, 28 Jan 2023 10:01:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0B019E085E for ; Sat, 28 Jan 2023 10:01:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 28A6A340EA6 for ; Sat, 28 Jan 2023 10:01:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6C483895 for ; Sat, 28 Jan 2023 10:01:56 +0000 (UTC) From: "Andrew Ammerlaan" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andrew Ammerlaan" Message-ID: <1674900097.a1e58c8f1e9b34d8f7b76969a4df5a33e2a47bf9.andrewammerlaan@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/ X-VCS-Repository: repo/gentoo X-VCS-Files: games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch games-util/lutris/lutris-9999.ebuild X-VCS-Directories: games-util/lutris/files/ games-util/lutris/ X-VCS-Committer: andrewammerlaan X-VCS-Committer-Name: Andrew Ammerlaan X-VCS-Revision: a1e58c8f1e9b34d8f7b76969a4df5a33e2a47bf9 X-VCS-Branch: master Date: Sat, 28 Jan 2023 10:01:56 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4098589c-2fdc-4dbd-a11d-c874968461ab X-Archives-Hash: 080e996ce240bf425325aceb99c9c835 commit: a1e58c8f1e9b34d8f7b76969a4df5a33e2a47bf9 Author: Andrew Ammerlaan gentoo org> AuthorDate: Sat Jan 28 10:00:34 2023 +0000 Commit: Andrew Ammerlaan gentoo org> CommitDate: Sat Jan 28 10:01:37 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1e58c8f games-util/lutris: update 9999 ebuild in preparation of 0.5.13 release Signed-off-by: Andrew Ammerlaan gentoo.org> .../lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch | 17 +++++++++++++++++ games-util/lutris/lutris-9999.ebuild | 18 ++++++++++++++---- 2 files changed, 31 insertions(+), 4 deletions(-) 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 new file mode 100644 index 000000000000..9685a826878b --- /dev/null +++ b/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch @@ -0,0 +1,17 @@ +diff --git a/lutris/gui/dialogs/webconnect_dialog.py b/lutris/gui/dialogs/webconnect_dialog.py +index 12fbbdc..a6cd838 100644 +--- a/lutris/gui/dialogs/webconnect_dialog.py ++++ b/lutris/gui/dialogs/webconnect_dialog.py +@@ -3,7 +3,11 @@ import os + from gettext import gettext as _ + + import gi +-gi.require_version("WebKit2", "4.0") ++try: ++ gi.require_version("WebKit2", "4.1") ++except (ImportError, ValueError): ++ gi.require_version("WebKit2", "4.0") ++ + from gi.repository import WebKit2 + + from lutris.gui.dialogs import ModalDialog diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild index e1ea8bd1147a..0b268cfd6c78 100644 --- a/games-util/lutris/lutris-9999.ebuild +++ b/games-util/lutris/lutris-9999.ebuild @@ -5,7 +5,8 @@ EAPI=8 PYTHON_COMPAT=( python3_{9..11} ) PYTHON_REQ_USE="sqlite,threads(+)" -DISTUTILS_SINGLE_IMPL="1" +DISTUTILS_SINGLE_IMPL=1 +DISTUTILS_USE_PEP517=setuptools inherit distutils-r1 optfeature virtualx xdg @@ -34,18 +35,23 @@ RDEPEND=" app-arch/p7zip app-arch/unzip $(python_gen_cond_dep ' + dev-python/certifi[${PYTHON_USEDEP}] dev-python/dbus-python[${PYTHON_USEDEP}] dev-python/distro[${PYTHON_USEDEP}] dev-python/lxml[${PYTHON_USEDEP}] dev-python/pillow[${PYTHON_USEDEP}] dev-python/pygobject:3[${PYTHON_USEDEP}] + dev-python/pypresence[${PYTHON_USEDEP}] dev-python/python-evdev[${PYTHON_USEDEP}] - dev-python/python-magic[${PYTHON_USEDEP}] dev-python/pyyaml[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] + dev-python/moddb[${PYTHON_USEDEP}] ') media-sound/fluid-soundfont - net-libs/webkit-gtk:4.1[introspection] + || ( + net-libs/webkit-gtk:4[introspection] + net-libs/webkit-gtk:4.1[introspection] + ) x11-apps/mesa-progs x11-apps/xgamma x11-apps/xrandr @@ -57,6 +63,10 @@ distutils_enable_tests pytest DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst ) +PATCHES=( + "${FILESDIR}/${PN}-0.5.13-webkit-gtk-4-1.patch" +) + python_test() { virtx epytest } @@ -69,7 +79,7 @@ python_install_all() { pkg_postinst() { xdg_pkg_postinst - optfeature "running windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader + optfeature "running MS Windows games through wine+DXVK/proton or other Vulkan games (plus ICD for your hardware)" media-libs/vulkan-loader # Quote README.rst elog ""