From: "Andrew Ammerlaan" <andrewammerlaan@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/
Date: Wed, 19 Oct 2022 08:59:26 +0000 (UTC) [thread overview]
Message-ID: <1666169958.91761cd36c49c499aa1143feb45f6a2a7cf8b7d1.andrewammerlaan@gentoo> (raw)
commit: 91761cd36c49c499aa1143feb45f6a2a7cf8b7d1
Author: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 19 08:57:23 2022 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Wed Oct 19 08:59:18 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91761cd3
games-util/lutris: add version 0.5.12_beta1
Closes: https://bugs.gentoo.org/876807
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>
games-util/lutris/Manifest | 1 +
.../files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch | 92 ++++++++++++++++++++++
...tris-9999.ebuild => lutris-0.5.12_beta1.ebuild} | 15 ++--
games-util/lutris/lutris-9999.ebuild | 2 -
4 files changed, 102 insertions(+), 8 deletions(-)
diff --git a/games-util/lutris/Manifest b/games-util/lutris/Manifest
index 278e4b2fbff7..a1aaa1ff023f 100644
--- a/games-util/lutris/Manifest
+++ b/games-util/lutris/Manifest
@@ -1,2 +1,3 @@
+DIST lutris-0.5.12_beta1.tar.gz 1138991 BLAKE2B 8bf47e49058690e4e42c6700b00daa7585787087f742dcaf9eab691a19ee9b230baaee6a7cde1f0b111104e750052afffd30b324e4b9aeb506b0851b7793d842 SHA512 24ac4c0f3ebadb2aca956604479c2a3ce5fb305c47be432a86b5db7ca30696550f138c8e9afd931ceb859c7f9145782cb86fe88850ddce5d95e4fe9e54cbf167
DIST lutris_0.5.10.1.tar.xz 1230464 BLAKE2B 5ba913f5e37956344b59c47c1315cf277ce57b1b771279c8aa4243971ea9f0c5277ad19b18655731048e989f752d957216d055ac6c26bb8731e52b4345d30847 SHA512 f6443fa86d0b38e1b5ba51054e50776eea63d9adda5738a7e69f2fe6b196f99491894d5068d6cddfd35d1baafa4188bd1935598b84266e9e23bd1b58c16dde20
DIST lutris_0.5.11.tar.xz 1337572 BLAKE2B 9baeaa078483812c25754691cde80324155a69fde7edc1aec043df806ceb0cbe05e04c71c73d9ff355d2aaa2f21d9e53871a1752b02022ae8527b69ed31cf47c SHA512 16b06f6a3377bfa8db5c3b1e1b3872cbfbd5e7ff27975b51083142dce9931c90a9827f8da7b2d9ba7b21e65bc4ca1759f6a720c142a01f99532274e152cfde0a
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
new file mode 100644
index 000000000000..3cc4a2a0eeea
--- /dev/null
+++ b/games-util/lutris/files/lutris-0.5.12_beta1-webkit-gtk-4.1.patch
@@ -0,0 +1,92 @@
+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
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-0.5.12_beta1.ebuild
similarity index 92%
copy from games-util/lutris/lutris-9999.ebuild
copy to games-util/lutris/lutris-0.5.12_beta1.ebuild
index 8808cea2f845..1d11a444efbf 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-0.5.12_beta1.ebuild
@@ -35,6 +35,7 @@ RDEPEND="
app-arch/unzip
$(python_gen_cond_dep '
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}]
@@ -43,22 +44,24 @@ RDEPEND="
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]
+ net-libs/webkit-gtk:4.1[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=(
+ # https://github.com/lutris/lutris/pull/4554
+ "${FILESDIR}/${P}-webkit-gtk-4.1.patch"
+)
+
+distutils_enable_tests pytest
+
python_test() {
virtx epytest
}
diff --git a/games-util/lutris/lutris-9999.ebuild b/games-util/lutris/lutris-9999.ebuild
index 8808cea2f845..f40afd7448f1 100644
--- a/games-util/lutris/lutris-9999.ebuild
+++ b/games-util/lutris/lutris-9999.ebuild
@@ -43,9 +43,7 @@ RDEPEND="
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
next reply other threads:[~2022-10-19 8:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-19 8:59 Andrew Ammerlaan [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-01-28 10:01 [gentoo-commits] repo/gentoo:master commit in: games-util/lutris/files/, games-util/lutris/ Andrew Ammerlaan
2022-04-12 9:08 Andrew Ammerlaan
2022-04-07 19:28 Sam James
2022-03-30 11:51 Andrew Ammerlaan
2021-10-29 19:04 Andrew Ammerlaan
2020-09-11 8:09 Lars Wendler
2020-09-11 8:09 Lars Wendler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1666169958.91761cd36c49c499aa1143feb45f6a2a7cf8b7d1.andrewammerlaan@gentoo \
--to=andrewammerlaan@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox