From 1e87d38d362022c7e30921b532b22212ab47c734 Mon Sep 17 00:00:00 2001 From: Mystro256 Date: Apr 13 2020 13:54:53 +0000 Subject: Add shell wrapper for wayland Fixes 1823234, wayland is not supported yet, so we need to force xwayland when launching terminal. This is because QT tries to use wayland. The nogui package doesn't have this issue. --- diff --git a/dolphin-emu.spec b/dolphin-emu.spec index e677561..c3d62f1 100644 --- a/dolphin-emu.spec +++ b/dolphin-emu.spec @@ -11,7 +11,7 @@ Name: dolphin-emu Version: 5.0.%{snapnumber} -Release: 3%{?dist} +Release: 4%{?dist} Summary: GameCube / Wii / Triforce Emulator Url: https://dolphin-emu.org/ @@ -172,6 +172,14 @@ popd mkdir -p %{buildroot}%{_udevrulesdir} install -m 0644 Data/51-usb-device.rules %{buildroot}%{_udevrulesdir}/51-dolphin-usb-device.rules +#Create shell wrapper; dolphin doesn't work on wayland yet, but the QT GUI +#tries to use it. For now, force xwayland. Also fixes bodhi test warning +mv %{buildroot}/%{_bindir}/%{name} %{buildroot}/%{_bindir}/%{name}-x11 +echo 'QT_QPA_PLATFORM=xcb %{name}-x11 "$@"' > %{buildroot}/%{_bindir}/%{name} +#Remove workaround in desktop: +sed -i "s/^Exec=.*/Exec=dolphin-emu/g" \ + %{buildroot}/%{_datadir}/applications/%{name}.desktop + #Install appdata.xml install -p -D -m 0644 %{SOURCE1} \ %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml @@ -185,7 +193,8 @@ appstream-util validate-relax --nonet \ %files -f %{name}.lang %doc Readme.md %license license.txt -%{_bindir}/%{name} +%attr(777, root, root) %{_bindir}/%{name} +%{_bindir}/%{name}-x11 %{_mandir}/man6/%{name}.* %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* @@ -211,6 +220,9 @@ appstream-util validate-relax --nonet \ %{_udevrulesdir}/51-dolphin-usb-device.rules %changelog +* Mon Apr 13 2020 Jeremy Newton - 5.0.10474-4 +- Add wrapper script for xwayland, fixes RH#1823234 + * Wed Mar 18 2020 Jeremy Newton - 5.0.10474-3 - Unbundle glslang