$ git diff --patch-with-stat --summary 34e0cb1630134eb04a3a206b8ef4dadb15e0fdf2..a191b3e36d14903ebf70692c8a5cf9f80c1de3e0
.abf.yml | 3 +-
0001-webconnect_dialog-Only-use-WebKit2-4.1.patch | 14 ++++
lutris-0.5.16-use-ayatana-appindicator.patch | 14 ++++
lutris.spec | 79 ++++++++++++++---------
4 files changed, 78 insertions(+), 32 deletions(-)
create mode 100644 0001-webconnect_dialog-Only-use-WebKit2-4.1.patch
create mode 100644 lutris-0.5.16-use-ayatana-appindicator.patch
diff --git a/.abf.yml b/.abf.yml
index 6512723..99c2ad3 100644
--- a/.abf.yml
+++ b/.abf.yml
@@ -1,2 +1,3 @@
sources:
- lutris-0.5.11.tar.gz: 991419037236c276e158b1cc4a6311323144f84a
+ lutris-0.5.19.tar.gz: 2a6f8db85ee7f8dd233b964dc02389f192934a9f
+ galaxy_blizzard_plugin-master.zip: a75ca0a9ee829c6c19f7084bbc39e2cc03d77f45
diff --git a/0001-webconnect_dialog-Only-use-WebKit2-4.1.patch b/0001-webconnect_dialog-Only-use-WebKit2-4.1.patch
new file mode 100644
index 0000000..a88b7f3
--- /dev/null
+++ b/0001-webconnect_dialog-Only-use-WebKit2-4.1.patch
@@ -0,0 +1,14 @@
+diff -up lutris-0.5.17/lutris/gui/dialogs/webconnect_dialog.py.2~ lutris-0.5.17/lutris/gui/dialogs/webconnect_dialog.py
+--- lutris-0.5.17/lutris/gui/dialogs/webconnect_dialog.py.2~ 2024-04-16 21:31:33.653385782 +0200
++++ lutris-0.5.17/lutris/gui/dialogs/webconnect_dialog.py 2024-04-16 21:32:28.785874915 +0200
+@@ -8,7 +8,9 @@ import gi
+ try:
+ gi.require_version("WebKit2", "4.1")
+ except ValueError:
+- gi.require_version("WebKit2", "4.0")
++ print("You need WebKit2 4.1")
++ exit(1)
++ # gi.require_version("WebKit2", "4.0")
+ from gi.repository import WebKit2
+
+ from lutris.gui.dialogs import ModalDialog
diff --git a/lutris-0.5.16-use-ayatana-appindicator.patch b/lutris-0.5.16-use-ayatana-appindicator.patch
new file mode 100644
index 0000000..0936fad
--- /dev/null
+++ b/lutris-0.5.16-use-ayatana-appindicator.patch
@@ -0,0 +1,14 @@
+diff -uraN lutris-0.5.17/lutris/gui/widgets/status_icon.py omv-lutris-0.5.17/lutris/gui/widgets/status_icon.py
+--- lutris-0.5.17/lutris/gui/widgets/status_icon.py 2024-04-11 01:27:01.000000000 +0200
++++ omv-lutris-0.5.17/lutris/gui/widgets/status_icon.py 2024-04-15 20:21:21.133908511 +0200
+@@ -10,8 +10,8 @@
+ from lutris.util import cache_single
+
+ try:
+- gi.require_version("AppIndicator3", "0.1")
+- from gi.repository import AppIndicator3 as AppIndicator
++ gi.require_version('AyatanaAppIndicator3', '0.1')
++ from gi.repository import AyatanaAppIndicator3 as AppIndicator
+
+ APP_INDICATOR_SUPPORTED = True
+ except (ImportError, ValueError):
diff --git a/lutris.spec b/lutris.spec
index bd28a29..58453de 100644
--- a/lutris.spec
+++ b/lutris.spec
@@ -1,14 +1,20 @@
Name: lutris
-Version: 0.5.11
-Release: 1
+Version: 0.5.19
+Release: 3
Summary: Install and play any video game easily
Group: Games/Other
License: GPLv3+
-URL: http://lutris.net
+URL: https://lutris.net
#Source0: http://lutris.net/releases/%{name}_%{version}.tar.xz
Source0: https://github.com/lutris/lutris/archive/refs/tags/v%{version}/%{name}-%{version}.tar.gz
+Source1: galaxy_blizzard_plugin-master.zip
+# taken from https://github.com/bartok765/galaxy_blizzard_plugin
+#Patch0: lutris-0.5.16-use-ayatana-appindicator.patch
+Patch1: 0001-webconnect_dialog-Only-use-WebKit2-4.1.patch
BuildArch: noarch
+BuildRequires: gettext
+BuildRequires: meson
BuildRequires: pkgconfig(python)
BuildRequires: pkgconfig(pygobject-3.0)
BuildRequires: python3dist(pyxdg)
@@ -16,27 +22,28 @@ BuildRequires: python3dist(setuptools)
BuildRequires: python3dist(pygobject)
BuildRequires: pkgconfig(gdk-3.0)
BuildRequires: pkgconfig(gtk+-3.0)
+BuildRequires: protobuf-compiler
-Requires: glib-networking
-Requires: gvfs
-Requires: python-gi
-
-Requires: python-dbus
-Requires: python-evdev >= 1.6.0
-Requires: python-gobject3
-Requires: python-pyxdg
-Requires: python-yaml
-Requires: xrandr
-Requires: python-requests
-Requires: python-pillow
-
-Requires: typelib(GDesktopEnums)
-Requires: typelib(GnomeDesktop)
-Requires: typelib(WebKit2)
-Requires: python3dist(distro)
-Requires: python3dist(lxml)
+Requires: glib-networking
+Requires: gvfs
+Requires: python-gi
+Requires: at-spi2-core
+Requires: python-dbus
+Requires: python-evdev >= 1.6.0
+Requires: python-gobject3
+Requires: python-pyxdg
+Requires: python-yaml
+Requires: xrandr
+Requires: python-requests
+Requires: python-pillow
+Requires: fluidsynth
+Requires: typelib(GDesktopEnums)
+Requires: typelib(GnomeDesktop)
+Requires: typelib(WebKit2) = 4.1
+Requires: python3dist(distro)
+Requires: python3dist(lxml)
Requires: python3dist(pypresence)
-Requires: %{_lib}gnome-desktop3_19
+Requires: %{_lib}gnome-desktop3_20
# Really optional, but it doesn't look good if we get a huge warning dialog
# on startup...
@@ -53,13 +60,15 @@ Requires: libgnutls30
# Optional deps without huge complaints
Recommends: python-pyinotify
-Recommends: wine
+Recommends: (wine or proton or proton-experimental)
Recommends: gamemode
%ifarch %{x86_64}
Recommends: gamemode(x86-32)
%endif
# Not ready (yet)
Recommends: libstrange
+# Optional
+Recommends: umu-launcher
%description
@@ -73,24 +82,32 @@ on Linux.
#https://github.com/lutris/lutris/issues/1428 (penguin)
%prep
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version} -a1
+mv galaxy_blizzard_plugin-master galaxy_blizzard_plugin
-%build
-python setup.py build
+# From Arch:
+# Regenerate protos to fix BattleNet plugin
+protoc --proto_path=galaxy_blizzard_plugin/src --python_out=. product_db.proto
+cp -vf product_db_pb2.py lutris/util/battlenet/product_db_pb2.py
+%build
+%meson
+%meson_build
# Sed to fix filemagic
sed -i setup.py -e "s/python-magic/file-magic/"
%install
-python setup.py install --root=%{buildroot}
+%meson_install
+
+%find_lang %{name}
-%files
+%files -f %{name}.lang
%{_bindir}/%{name}
%{_datadir}/%{name}/
%{_datadir}/metainfo/net.lutris.Lutris.metainfo.xml
%{_datadir}/applications/net.lutris.Lutris.desktop
%{_mandir}/man1/lutris.1.*
-%{_iconsdir}/hicolor/*/apps/%{name}.png
-%{_iconsdir}/hicolor/scalable/apps/%{name}.svg
-%{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info
+%{_iconsdir}/hicolor/*x*/apps/net.lutris.Lutris.png
+%{_iconsdir}/hicolor/scalable/apps/net.lutris.Lutris.svg
+#{python_sitelib}/%{name}-%{version}-py%{python_version}.egg-info
%{python_sitelib}/%{name}/