Hello community,

here is the log from the commit of package amarok for openSUSE:Factory checked 
in at 2016-09-25 14:27:53
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/amarok (Old)
 and      /work/SRC/openSUSE:Factory/.amarok.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "amarok"

Changes:
--------
--- /work/SRC/openSUSE:Factory/amarok/amarok.changes    2016-05-31 
12:11:11.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.amarok.new/amarok.changes       2016-09-25 
14:27:55.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Sep 18 22:12:37 UTC 2016 - [email protected]
+
+- Add Fix-MPRIS2-DesktopEntry-value.patch to get working media
+  controls in plasma taskbar (kde#565275) 
+
+-------------------------------------------------------------------

New:
----
  Fix-MPRIS2-DesktopEntry-value.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ amarok.spec ++++++
--- /var/tmp/diff_new_pack.t6rraU/_old  2016-09-25 14:27:57.000000000 +0200
+++ /var/tmp/diff_new_pack.t6rraU/_new  2016-09-25 14:27:57.000000000 +0200
@@ -61,6 +61,8 @@
 Patch110:       amarok-ffmpeg3.0.patch
 # PATCH-FIX-UPSTREAM Fix-for-infinite-loop-with-some-Audio-CDs.patch 
kde#339190 -- Fix for the infinite loop in case a home-burned or old audio CD 
is inserted
 Patch111:       Fix-for-infinite-loop-with-some-Audio-CDs.patch
+# PATCH-FIX-UPSTREAM Fix-MPRIS2-DesktopEntry-value.patch, nec essary for 
working media controls in taskbar plsama 5.7 -- kde#565275
+Patch112:       Fix-MPRIS2-DesktopEntry-value.patch
 # Required for the fdupes macro
 BuildRequires:  fdupes
 BuildRequires:  gdk-pixbuf-devel
@@ -136,6 +138,7 @@
 %patch109 -p1
 %patch110 -p0
 %patch111 -p1
+%patch112 -p1
 
 # Remove build time references so build-compare can do its work
 FAKE_BUILDDATE=$(LC_ALL=C date -u -r %{SOURCE99} '+%%b %%e %%Y')

++++++ Fix-MPRIS2-DesktopEntry-value.patch ++++++
From: Antonio Rojas <[email protected]>
Date: Sat, 20 Aug 2016 11:09:02 +0000
Subject: Fix MPRIS2 DesktopEntry value
X-Git-Url: 
http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=9449ec56d1fd77a0bfa1f7134a2bf4f91ffd14d3
---
Fix MPRIS2 DesktopEntry value

According to the MPRIS2 spec, the DesktopEntry value should be
"the basename of the .desktop file" [1], not the desktop-file-id. So
for amarok it should be "amarok" and not "kde4-amarok", regardless of
where the desktop file is installed. This fixes displaying MPRIS
controls in the Amarok taskbar tooltip in Plasma 5.7

[1] 
https://specifications.freedesktop.org/mpris-spec/latest/Media_Player.html#Property:DesktopEntry

Testing done by Antonio:

Player controls are displayed again in the Amarok taskbar tooltip in Plasma 5.7.

REVIEW: 128418
BUG: 365275
FIXED-IN: 2.9
---



--- a/src/dbus/mpris2/MediaPlayer2.cpp
+++ b/src/dbus/mpris2/MediaPlayer2.cpp
@@ -94,11 +94,7 @@
 
 QString MediaPlayer2::DesktopEntry() const
 {
-    // Amarok desktop file is installed in $prefix/share/applications/kde4/
-    // rather than in $prefix/share/applications. The standard way to
-    // represent this dir is with a "kde4-" prefix. See:
-    // 
http://standards.freedesktop.org/menu-spec/1.0/go01.html#term-desktop-file-id
-    return QLatin1String("kde4-amarok");
+    return QLatin1String("amarok");
 }
 
 QStringList MediaPlayer2::SupportedUriSchemes() const


Reply via email to