summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Ammerlaan <andrewammerlaan@gentoo.org>2023-04-25 12:27:51 +0200
committerAndrew Ammerlaan <andrewammerlaan@gentoo.org>2023-04-25 12:33:05 +0200
commit0a76cd8ebcc0514b461ca24a919a01c131147f3a (patch)
tree02dcd6a8b04608e49e0ebe0f3b18477d4c59d3a5 /media-sound/spotify
parentmedia-sound/spotify-tray: move spotify-tray executable (diff)
downloadgentoo-0a76cd8ebcc0514b461ca24a919a01c131147f3a.tar.gz
gentoo-0a76cd8ebcc0514b461ca24a919a01c131147f3a.tar.bz2
gentoo-0a76cd8ebcc0514b461ca24a919a01c131147f3a.zip
media-sound/spotify: update wrapper for changed spotify-tray path
Also force launch with x11 if using spotify-tray. It works in an X11 session or via xwayland. But launching in native wayland completely breaks it. Upstream indicates this will not be fixed. See-also: https://forums.gentoo.org/viewtopic-t-1150175.html Signed-off-by: Andrew Ammerlaan <andrewammerlaan@gentoo.org>
Diffstat (limited to 'media-sound/spotify')
-rw-r--r--media-sound/spotify/files/spotify-wrapper4
-rw-r--r--media-sound/spotify/spotify-1.2.8-r1.ebuild (renamed from media-sound/spotify/spotify-1.2.8.ebuild)0
2 files changed, 2 insertions, 2 deletions
diff --git a/media-sound/spotify/files/spotify-wrapper b/media-sound/spotify/files/spotify-wrapper
index fd6c4f314f9f..862fa4c680d6 100644
--- a/media-sound/spotify/files/spotify-wrapper
+++ b/media-sound/spotify/files/spotify-wrapper
@@ -5,7 +5,7 @@ export LD_LIBRARY_PATH="/usr/$LIBDIR/apulse"
if command -v spotify-dbus.py > /dev/null; then
echo "Launching spotify with Gnome systray integration."
spotify-dbus.py "$@"
-elif command -v spotify-tray > /dev/null; then
+elif [ -e "$SPOTIFY_HOME/spotify-tray" ] > /dev/null; then
echo "Launching spotify with generic systray integration."
minimized=
for arg; do
@@ -14,7 +14,7 @@ elif command -v spotify-tray > /dev/null; then
break
fi
done
- spotify-tray \
+ GDK_BACKEND="x11" "$SPOTIFY_HOME/spotify-tray" \
--client-path="$SPOTIFY_HOME/spotify" --toggle $minimized -- "$@"
else
if pgrep -f "Spotify/[0-9].[0-9].[0-9]" > /dev/null; then
diff --git a/media-sound/spotify/spotify-1.2.8.ebuild b/media-sound/spotify/spotify-1.2.8-r1.ebuild
index f99e0123c1f0..f99e0123c1f0 100644
--- a/media-sound/spotify/spotify-1.2.8.ebuild
+++ b/media-sound/spotify/spotify-1.2.8-r1.ebuild