From d414c993cafd9e31a370c4a5aae042c710df2419 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 28 Jan 2023 14:51:38 +0000 Subject: gentoo auto-resync : 28:01:2023 - 14:51:38 --- games-util/lutris/Manifest | 3 ++- .../lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch | 17 +++++++++++++++++ games-util/lutris/lutris-9999.ebuild | 18 ++++++++++++++---- 3 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch (limited to 'games-util/lutris') diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest index 501d20e0b17d..3e36d5719909 100644 --- a/games-util/lutris/Manifest +++ b/games-util/lutris/Manifest @@ -1,6 +1,7 @@ +AUX lutris-0.5.13-webkit-gtk-4-1.patch 537 BLAKE2B 17d233876bb859bebd34845845ee0668ebc0f41aaa53c9e1353a9a24f9ed5beb134249cf95e1ddf0dd25ce0114f2ce765959019c00ef4cd822035e215c1d5733 SHA512 e4b4b8cb31b0ba8ad1ed64581ae6194b5f1f5edc677f33d8fb48f63b0702e355ad4a6f782a44c74c4ebd3d20dd9494b520dbd852e98ac35d53331a5e5b59cbe1 DIST lutris_0.5.11.tar.xz 1337572 BLAKE2B 9baeaa078483812c25754691cde80324155a69fde7edc1aec043df806ceb0cbe05e04c71c73d9ff355d2aaa2f21d9e53871a1752b02022ae8527b69ed31cf47c SHA512 16b06f6a3377bfa8db5c3b1e1b3872cbfbd5e7ff27975b51083142dce9931c90a9827f8da7b2d9ba7b21e65bc4ca1759f6a720c142a01f99532274e152cfde0a DIST lutris_0.5.12.tar.xz 2252220 BLAKE2B 511de660e32ab8961d951d5777ef21a343ab46736cc74f2202721f3280cfab39cac0a8a7003db4eaa48265f4af2d598c1011ce45988815624accda18663a2f00 SHA512 032f9b628bc829bfde347c8137cad80a28cad16651baf461a344045d23c0f19d860627a042225de16046d14d45e03e5ebf7a3a82010128c114e2a0f429a02bf9 EBUILD lutris-0.5.11.ebuild 2210 BLAKE2B 42c05470a8f8942f9501312298db1d1df30215e9026e7df5216f9f2cf2546975257d56d224f731c9c5303f86f96235a174cd4eb0f6eba69bf7b7986f64fc3c75 SHA512 f1e1b5517ff5f33f139ed26992175b1db9e7a61214df9640aec47ebeb69d1951a3d570d9e3796ee8edc013a2462bce2886f37d10409716db127cad278ff2443b EBUILD lutris-0.5.12.ebuild 2173 BLAKE2B c3a091535f2f8c7b53a652f25e22ed1ca592c9aef0a200828f1e4a77d085a1d66112018a12195a69d4417e27519ec1703ad471b099e77816e8c90d5204fb185b SHA512 7354be6e5bd7ce057518498e77b807019a5c6bd6fb6865cf8d32363dbfbafc2e1a5310dc16b8e62cfc5cc50134c160ceb63d38d1c629d7779581733cea123640 -EBUILD lutris-9999.ebuild 2134 BLAKE2B 1bd15b681d00c718cf8d0b9c8b1797c4b10613e7c322a9650d53469ef7d3266df1820c044f95fd45110ddd9dc83b6b5eb519a6d823929534fac586a1e3b18626 SHA512 fc5eeaac06a3495391fb4b711bb4c224a2b8666c699a63b678802cc9a8e9d0f9b674bc49f179fdae614f0d092c87fc45a00b42e7f02ce99a2f897047cde6d8d9 +EBUILD lutris-9999.ebuild 2352 BLAKE2B 62b012bd649b4d976abcfe9f04993098a760d9e2f9c94774941f2603c19612b959ec81b30fac2b7be66aea7c049174e056ed3f030be70b5a1ff1c3bd74b3cca8 SHA512 1e85b4a8390600e059ec3890a5b3735e1051bed62fe4605a91c7c2abc5b7727a50b0f595ad19c4f9e11348a804f6d82ba2ad523f9a85172ed3236b72a827db9c MISC metadata.xml 781 BLAKE2B 4f125f51efebe519dab960da879b988cc1d5675449b288a344df7647a660e190ac393d9195daee17fc4e181f1b07f6ffed17c7d1d222217a0afad44c0e15fe59 SHA512 83a29e9fad3e474ef81aa4c07bb6f1f8b77456eaf17f3aad4f34c12c2101cfd55fbd0b1ac8e2c1f682a2ab859c266f920a311aaa01cf9e53b762bd883a65b66f 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 "" -- cgit v1.2.3