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

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

[Conrad Kostecki]

commit:     d00f89b8fe0f572d61b4c5a769a4dc9880582de4
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 17 16:12:06 2021 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Feb 17 19:32:53 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d00f89b8

games-util/lutris: remove unused patch(es)

Closes: https://github.com/gentoo/gentoo/pull/19502
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 .../lutris/files/lutris-0.5.7-copy_paste_fix.patch | 38 ----------------------
 1 file changed, 38 deletions(-)

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
deleted file mode 100644
index 3e278561aa3..00000000000
--- a/games-util/lutris/files/lutris-0.5.7-copy_paste_fix.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 9603da9d4eda1656219a4c79e1f9d1a958165151 Mon Sep 17 00:00:00 2001
-From: Austin Pua <pua.austin.anderson@gmail.com>
-Date: Wed, 1 Jul 2020 21:48:09 +0800
-Subject: [PATCH] Fix copy paste issue in auth webviews
-
----
- lutris/services/gog.py          | 3 ++-
- lutris/services/humblebundle.py | 3 ++-
- 2 files changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/lutris/services/gog.py b/lutris/services/gog.py
-index 0eed7778c..099f9083d 100644
---- a/lutris/services/gog.py
-+++ b/lutris/services/gog.py
-@@ -279,7 +279,8 @@ def connect(parent=None):
-     """Connect to GOG"""
-     logger.debug("Connecting to GOG")
-     dialog = WebConnectDialog(SERVICE, parent)
--    dialog.run()
-+    dialog.set_modal(True)
-+    dialog.show()
- 
- 
- def disconnect():
-diff --git a/lutris/services/humblebundle.py b/lutris/services/humblebundle.py
-index 6dcfe6911..056ef9460 100644
---- a/lutris/services/humblebundle.py
-+++ b/lutris/services/humblebundle.py
-@@ -152,7 +152,8 @@ def is_connected():
- def connect(parent=None):
-     """Connect to Humble Bundle"""
-     dialog = WebConnectDialog(SERVICE, parent)
--    dialog.run()
-+    dialog.set_modal(True)
-+    dialog.show()
- 
- 
- def disconnect():

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

[Andrew Ammerlaan]

commit:     80cebc0f63d2bff3e554b5e41b3200a0d5ec28e7
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Tue Dec  6 18:38:54 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Dec  6 18:45:57 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=80cebc0f

games-util/lutris: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28573
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch | 92 ----------------------
 1 file changed, 92 deletions(-)

diff --git a/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch b/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch
deleted file mode 100644
index 3cc4a2a0eeea..000000000000
--- a/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch
+++ /dev/null
@@ -1,92 +0,0 @@
-diff --git a/.travis.yml b/.travis.yml
-index ec50a82bbe..858a6105b2 100644
---- a/.travis.yml
-+++ b/.travis.yml
-@@ -28,8 +28,7 @@ addons:
-       - gir1.2-glib-2.0
-       - libgirepository1.0-dev
-       - gir1.2-gnomedesktop-3.0
--      - gir1.2-webkit2-4.0
--      - gir1.2-notify-0.7
-+      - gir1.2-webkit2-4.1
-       - at-spi2-core
- before_install:
-   - "export DISPLAY=:99.0"
-diff --git a/INSTALL.rst b/INSTALL.rst
-index 94d5cc756a..a83cc0b629 100644
---- a/INSTALL.rst
-+++ b/INSTALL.rst
-@@ -12,7 +12,7 @@ Lutris manually, it requires the following components:
- 
-     * Python >= 3.7
-     * PyGObject
--    * PyGObject bindings for: Gtk, Gdk, GnomeDesktop, Webkit2, Notify
-+    * PyGObject bindings for: Gtk, Gdk, GnomeDesktop, Webkit2
-     * python3-requests
-     * python3-pillow
-     * python3-yaml
-@@ -41,8 +41,8 @@ To install all those dependencies (except for Wine and graphics drivers)
- on Ubuntu based systems, you can run::
- 
-     sudo apt install python3-yaml python3-requests python3-pil python3-gi \
--      gir1.2-gtk-3.0 gir1.2-gnomedesktop-3.0 gir1.2-webkit2-4.0 \
--      gir1.2-notify-0.7 psmisc cabextract unzip p7zip curl fluid-soundfont-gs \
-+      gir1.2-gtk-3.0 gir1.2-gnomedesktop-3.0 gir1.2-webkit2-4.1 \
-+      psmisc cabextract unzip p7zip curl fluid-soundfont-gs \
-       x11-xserver-utils python3-evdev libc6-i386 lib32gcc1 libgirepository1.0-dev \
-       python3-setproctitle python3-distro
- 
-diff --git a/debian/control b/debian/control
-index bf0eb2121f..c74a523fed 100644
---- a/debian/control
-+++ b/debian/control
-@@ -26,8 +26,7 @@ Depends: ${misc:Depends},
-          python3-distro,
-          python3-dbus,
-          gir1.2-gtk-3.0,
--         gir1.2-webkit2-4.0,
--         gir1.2-notify-0.7,
-+         gir1.2-webkit2-4.1,
-          psmisc,
-          cabextract,
-          unzip,
-diff --git a/lutris.spec b/lutris.spec
-index 13763266b0..fb430ef206 100644
---- a/lutris.spec
-+++ b/lutris.spec
-@@ -43,7 +43,7 @@ BuildRequires:  hicolor-icon-theme
- BuildRequires:  python3-setuptools
- Requires:       (python3-gobject-Gdk or python3-gobject)
- Requires:       python3-PyYAML, cabextract, typelib-1_0-Gtk-3_0
--Requires:       typelib-1_0-GnomeDesktop-3_0, typelib-1_0-WebKit2-4_0, typelib-1_0-Notify-0_7
-+Requires:       typelib-1_0-GnomeDesktop-3_0, typelib-1_0-WebKit2-4_1
- Requires:       fluid-soundfont-gm, python3-Pillow, python3-requests
- %endif
- 
-diff --git a/lutris/gui/dialogs/webconnect_dialog.py b/lutris/gui/dialogs/webconnect_dialog.py
-index a7c5aa653a..195e1f6788 100644
---- a/lutris/gui/dialogs/webconnect_dialog.py
-+++ b/lutris/gui/dialogs/webconnect_dialog.py
-@@ -3,7 +3,7 @@
- from gettext import gettext as _
- 
- import gi
--gi.require_version("WebKit2", "4.0")
-+gi.require_version("WebKit2", "4.1")
- from gi.repository import WebKit2
- 
- from lutris.gui.dialogs import ModalDialog
-diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
-index babf66ff9c..515981f250 100644
---- a/snap/snapcraft.yaml
-+++ b/snap/snapcraft.yaml
-@@ -90,8 +90,7 @@ parts:
-       - gir1.2-glib-2.0
-       - gir1.2-gnomedesktop-3.0
-       - gir1.2-gtk-3.0
--      - gir1.2-notify-0.7
--      - gir1.2-webkit2-4.0
-+      - gir1.2-webkit2-4.1
-       - libgnutls30
-       - libvulkan1
-       - libxrandr2

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

[Andrew Ammerlaan]

commit:     27e99c8e283d34b7abc8943046d5750d0557f5af
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Feb 22 16:42:26 2023 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Thu Feb 23 07:37:35 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27e99c8e

games-util/lutris: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/29726
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 .../lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch     | 17 -----------------
 1 file changed, 17 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
deleted file mode 100644
index 9685a826878b..000000000000
--- a/games-util/lutris/files/lutris-0.5.13-webkit-gtk-4-1.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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

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

[Joonas Niilola]

commit:     6c542b0d1f77d6ae7e02cf6d2c27b5249ca128fb
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Sat Oct 26 14:06:55 2024 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Oct 27 07:10:31 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c542b0d

games-util/lutris: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/39115
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 .../files/lutris-0.5.13-find-eselected-wine.patch  | 22 ----------------------
 1 file changed, 22 deletions(-)

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
deleted file mode 100644
index d048a807b08d..000000000000
--- a/games-util/lutris/files/lutris-0.5.13-find-eselected-wine.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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