[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/, games-util/lutris/files/

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/, games-util/lutris/files/

[Stefan Strogin]

commit:     3e758a76a1ecef8d224e11a208db33f6f69b9451
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Thu Jan  2 02:21:39 2020 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Thu Jan  2 02:25:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e758a76

games-util/lutris: add patch to fix issue with x11-libs/gtk+-3.24.13

Reported-by: Marcin Woźniak <y0rune <AT> aol.com>
Closes: https://bugs.gentoo.org/704130
Package-Manager: Portage-2.3.84, Repoman-2.3.20
Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 games-util/lutris/files/lutris-0.5.4-gtk.patch     | 29 ++++++++++++++++++++++
 ...{lutris-0.5.4.ebuild => lutris-0.5.4-r1.ebuild} |  4 ++-
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/games-util/lutris/files/lutris-0.5.4-gtk.patch b/games-util/lutris/files/lutris-0.5.4-gtk.patch
new file mode 100644
index 00000000000..a2c5d71d998
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.4-gtk.patch
@@ -0,0 +1,29 @@
+From a97150b78954e176cb0f825f0c201f54d5da613e Mon Sep 17 00:00:00 2001
+From: Stefan Strogin <steils@gentoo.org>
+Date: Tue, 31 Dec 2019 03:22:26 +0200
+Subject: [PATCH] Call the correct method for creating TreeModelSort (Closes
+ #2554)
+
+Upstream-Status: Accepted
+[https://github.com/lutris/lutris/commit/a99b17f00dfc4cdab80c237752cc3167d64194eb]
+Signed-off-by: Stefan Strogin <steils@gentoo.org>
+---
+ lutris/gui/views/store.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/lutris/gui/views/store.py b/lutris/gui/views/store.py
+index ba331313..4d5f372e 100644
+--- a/lutris/gui/views/store.py
++++ b/lutris/gui/views/store.py
+@@ -130,7 +130,7 @@ class GameStore(GObject.Object):
+         self.prevent_sort_update = False  # prevent recursion with signals
+         self.modelfilter = self.store.filter_new()
+         self.modelfilter.set_visible_func(self.filter_view)
+-        self.modelsort = Gtk.TreeModelSort.sort_new_with_model(self.modelfilter)
++        self.modelsort = Gtk.TreeModelSort.new_with_model(self.modelfilter)
+         self.modelsort.connect("sort-column-changed", self.on_sort_column_changed)
+         self.modelsort.set_sort_func(sort_col, sort_func, sort_col)
+         self.sort_view(sort_key, sort_ascending)
+-- 
+2.24.1
+

diff --git a/games-util/lutris/lutris-0.5.4.ebuild b/games-util/lutris/lutris-0.5.4-r1.ebuild
similarity index 95%
rename from games-util/lutris/lutris-0.5.4.ebuild
rename to games-util/lutris/lutris-0.5.4-r1.ebuild
index 7eb0bd47ed1..e84a2566047 100644
--- a/games-util/lutris/lutris-0.5.4.ebuild
+++ b/games-util/lutris/lutris-0.5.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -49,6 +49,8 @@ RDEPEND="
 	x11-libs/libnotify
 "
 
+PATCHES=( "${FILESDIR}/${P}-gtk.patch" )
+
 python_install_all() {
 	local DOCS=( AUTHORS README.rst docs/installers.rst )
 	distutils-r1_python_install_all

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/, games-util/lutris/files/

[Andrew Ammerlaan]

commit:     a6fb0b9321bf08b11332bcd845a797cf2bcbb9f8
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 21 12:59:53 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Apr 21 13:00:43 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a6fb0b93

games-util/lutris: drop 0.5.10

Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 games-util/lutris/Manifest                         |  1 -
 ...ris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch | 46 ------------
 ....1-avoid-gtk-4.0-already-loaded-testerror.patch | 13 ----
 games-util/lutris/lutris-0.5.10.ebuild             | 87 ----------------------
 4 files changed, 147 deletions(-)

diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 8c0b453ba6ba..d112f3cf9de7 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,2 +1 @@
 DIST lutris_0.5.10.1.tar.xz 1230464 BLAKE2B 5ba913f5e37956344b59c47c1315cf277ce57b1b771279c8aa4243971ea9f0c5277ad19b18655731048e989f752d957216d055ac6c26bb8731e52b4345d30847 SHA512 f6443fa86d0b38e1b5ba51054e50776eea63d9adda5738a7e69f2fe6b196f99491894d5068d6cddfd35d1baafa4188bd1935598b84266e9e23bd1b58c16dde20
-DIST lutris_0.5.10.tar.xz 1225880 BLAKE2B bd46531695860c60a4b94c7bc1f4366bb6f5a9d4a098e0eff69f85e9edee0d551b6f55276a4ae48fb28e75a706da526dfaf7fbcf17af8ebbee6e809f6f39825f SHA512 cb77afe40f1ceb053edf8aaa4f97fd44f0c8ecc33450a16b83373408807891d99bd409cf26d98543a0789a5dc38475d584790de1d48e0e56762945a7b6ca63e3

diff --git a/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch b/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
deleted file mode 100644
index 5ff491486d5a..000000000000
--- a/games-util/lutris/files/lutris-0.5.9-choose-amdgpu-pro-vulkan-driver.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-diff --git a/lutris/sysoptions.py b/lutris/sysoptions.py
-index 8896b7d..565bbab 100644
---- a/lutris/sysoptions.py
-+++ b/lutris/sysoptions.py
-@@ -82,6 +82,7 @@ def get_vk_icd_choices():
-     amdradv = []
-     nvidia = []
-     amdvlk = []
-+    amdvlkpro = []
-     choices = [(_("Auto: WARNING -- No Vulkan Loader detected!"), "")]
-     icd_files = defaultdict(list)
-     # Add loaders
-@@ -96,13 +97,17 @@ def get_vk_icd_choices():
-                 amdradv.append(loader)
-             elif "nvidia" in loader:
-                 nvidia.append(loader)
--            elif "amd_icd" in loader:
--                amdvlk.append(loader)
-+            elif "amd" in loader:
-+                if "pro" in loader:
-+                    amdvlkpro.append(loader)
-+                else:
-+                    amdvlk.append(loader)
- 
-     intel_files = ":".join(intel)
-     amdradv_files = ":".join(amdradv)
-     nvidia_files = ":".join(nvidia)
-     amdvlk_files = ":".join(amdvlk)
-+    amdvlkpro_files = ":".join(amdvlkpro)
- 
-     glxinfocmd = get_gpu_vendor_cmd(0)
-     if nvidia_files:
-@@ -125,7 +130,12 @@ def get_vk_icd_choices():
-     if nvidia_files:
-         choices.append(("Nvidia Proprietary", nvidia_files))
-     if amdvlk_files:
--        choices.append(("AMDVLK/AMDGPU-PRO Proprietary", amdvlk_files))
-+        if not amdvlkpro_files:
-+            choices.append(("AMDVLK/AMDGPU-PRO Proprietary", amdvlk_files))
-+        else:
-+            choices.append(("AMDVLK Open source", amdvlk_files))
-+    if amdvlkpro_files:
-+        choices.append(("AMDGPU-PRO Proprietary", amdvlkpro_files))
-     return choices
- 
- 

diff --git a/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch b/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch
deleted file mode 100644
index 8c0d366926b7..000000000000
--- a/games-util/lutris/files/lutris-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/lutris/util/test_config.py b/lutris/util/test_config.py
-index b3feb87..01b9294 100644
---- a/lutris/util/test_config.py
-+++ b/lutris/util/test_config.py
-@@ -1,5 +1,8 @@
- import os
- 
-+import gi
-+gi.require_version('Gtk', '3.0')
-+
- from lutris import startup
- from lutris.database import schema
- 

diff --git a/games-util/lutris/lutris-0.5.10.ebuild b/games-util/lutris/lutris-0.5.10.ebuild
deleted file mode 100644
index ba883a7fe92a..000000000000
--- a/games-util/lutris/lutris-0.5.10.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="sqlite,threads(+)"
-DISTUTILS_SINGLE_IMPL="1"
-
-inherit distutils-r1 optfeature virtualx xdg
-
-DESCRIPTION="An open source gaming platform for GNU/Linux"
-HOMEPAGE="https://lutris.net/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/lutris/lutris.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_beta* ]] ; then
-		SRC_URI="https://github.com/lutris/lutris/archive/refs/tags/v${PV/_/-}.tar.gz -> ${P}.tar.gz"
-		S="${WORKDIR}"/${P/_/-}
-	else
-		SRC_URI="https://lutris.net/releases/${P/-/_}.tar.xz"
-		S="${WORKDIR}/${PN}"
-		KEYWORDS="~amd64 ~x86"
-	fi
-fi
-
-LICENSE="GPL-3+ CC0-1.0"
-SLOT="0"
-
-RDEPEND="
-	app-arch/cabextract
-	app-arch/p7zip
-	app-arch/unzip
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pillow[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		dev-python/python-evdev[${PYTHON_USEDEP}]
-		dev-python/python-magic[${PYTHON_USEDEP}]
-		dev-python/pyyaml[${PYTHON_USEDEP}]
-		dev-python/requests[${PYTHON_USEDEP}]
-	')
-	gnome-base/gnome-desktop:3[introspection]
-	media-sound/fluid-soundfont
-	net-libs/libsoup
-	net-libs/webkit-gtk:4[introspection]
-	x11-apps/mesa-progs
-	x11-apps/xgamma
-	x11-apps/xrandr
-	x11-libs/gtk+:3[introspection]
-	x11-libs/gdk-pixbuf[jpeg]
-	x11-libs/libnotify[introspection]
-"
-
-distutils_enable_tests pytest
-
-DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.5.9.1-avoid-gtk-4.0-already-loaded-testerror.patch"
-	"${FILESDIR}/${PN}-0.5.9-choose-amdgpu-pro-vulkan-driver.patch"
-)
-
-python_test() {
-	virtx epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	python_fix_shebang "${ED}/usr/share/lutris/bin/lutris-wrapper" #740048
-}
-
-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
-
-	# Quote README.rst
-	elog ""
-	elog "Lutris installations are fully automated through scripts, which can"
-	elog "be written in either JSON or YAML. The scripting syntax is described"
-	elog "in ${EROOT}/usr/share/doc/${PF}/installers.rst.bz2, and is also"
-	elog "available online at lutris.net."
-}

[gentoo-commits] repo/gentoo:master commit in: games-util/lutris/, games-util/lutris/files/

[Andrew Ammerlaan]

commit:     362740388ae05b23a50d785ffc37513674a0e7db
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 29 21:02:38 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Sat Jul 29 21:02:38 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=36274038

games-util/lutris: fix use of system wine

Bug: https://bugs.gentoo.org/911245
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../files/lutris-0.5.13-find-eselected-wine.patch  | 22 ++++++++++++++++++++++
 ...is-0.5.13-r1.ebuild => lutris-0.5.13-r2.ebuild} |  4 ++++
 2 files changed, 26 insertions(+)

diff --git a/games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch b/games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch
new file mode 100644
index 000000000000..d048a807b08d
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch
@@ -0,0 +1,22 @@
+diff --git a/lutris/util/wine/wine.py b/lutris/util/wine/wine.py
+index f84584b..fa36d0c 100644
+--- a/lutris/util/wine/wine.py
++++ b/lutris/util/wine/wine.py
+@@ -19,7 +19,7 @@ WINE_PATHS = {
+     "winehq-devel": "/opt/wine-devel/bin/wine",
+     "winehq-staging": "/opt/wine-staging/bin/wine",
+     "wine-development": "/usr/lib/wine-development/wine",
+-    "system": "wine",
++    "system": "/etc/eselect/wine/bin/wine",
+ }
+ 
+ ESYNC_LIMIT_CHECK = os.environ.get("ESYNC_LIMIT_CHECK", "").lower()
+@@ -273,7 +273,7 @@ def get_wine_version(wine_path="wine"):
+         return
+     if wine_path == "wine" and not system.find_executable("wine"):
+         return
+-    if os.path.isabs(wine_path):
++    if os.path.isabs(wine_path) and not os.path.islink(wine_path):
+         wine_stats = os.stat(wine_path)
+         if wine_stats.st_size < 2000:
+             # This version is a script, ignore it

diff --git a/games-util/lutris/lutris-0.5.13-r1.ebuild b/games-util/lutris/lutris-0.5.13-r2.ebuild
similarity index 97%
rename from games-util/lutris/lutris-0.5.13-r1.ebuild
rename to games-util/lutris/lutris-0.5.13-r2.ebuild
index 62930e73e736..6fea47bf5df8 100644
--- a/games-util/lutris/lutris-0.5.13-r1.ebuild
+++ b/games-util/lutris/lutris-0.5.13-r2.ebuild
@@ -65,6 +65,10 @@ distutils_enable_tests pytest
 
 DOCS=( AUTHORS README.rst docs/installers.rst docs/steam.rst )
 
+PATCHES=(
+	"${FILESDIR}/${P}-find-eselected-wine.patch"
+)
+
 python_test() {
 	virtx epytest
 }