Bump Webkit2 dependency to 4.1

Webkit2 4.0 uses libsoup 2 which is deprecated, and as such it is not
part of the GNOME 43 runtime. The only difference in 4.1 is the use of
soup3 instead of soup2.
This commit is contained in:
Maximiliano Sandoval R 2022-10-10 22:50:08 +02:00
parent 5c20dff48d
commit 5c2cf7be51
No known key found for this signature in database
GPG key ID: D64A8D747F6FE706
6 changed files with 10 additions and 6 deletions

View file

@ -28,7 +28,7 @@ addons:
- gir1.2-glib-2.0
- libgirepository1.0-dev
- gir1.2-gnomedesktop-3.0
- gir1.2-webkit2-4.0
- gir1.2-webkit2-4.1
- at-spi2-core
before_install:
- "export DISPLAY=:99.0"

View file

@ -41,7 +41,7 @@ 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-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

2
debian/control vendored
View file

@ -26,7 +26,7 @@ Depends: ${misc:Depends},
python3-distro,
python3-dbus,
gir1.2-gtk-3.0,
gir1.2-webkit2-4.0,
gir1.2-webkit2-4.1,
psmisc,
cabextract,
unzip,

View file

@ -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
Requires: typelib-1_0-GnomeDesktop-3_0, typelib-1_0-WebKit2-4_1
Requires: fluid-soundfont-gm, python3-Pillow, python3-requests
%endif

View file

@ -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

View file

@ -90,7 +90,7 @@ parts:
- gir1.2-glib-2.0
- gir1.2-gnomedesktop-3.0
- gir1.2-gtk-3.0
- gir1.2-webkit2-4.0
- gir1.2-webkit2-4.1
- libgnutls30
- libvulkan1
- libxrandr2