[SCM] Amarok packaging branch, master, updated. debian/2.8.0-5-2-gec0e3de

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=ec0e3de

The following commit has been merged in the master branch:
commit ec0e3de5d69c4f8c8534daef38f7cbe52be1b634
Author: Pino Toscano <pino at debian.org>
Date:   Sun Sep 18 18:59:39 2016 +0200

    fix the MPRIS2 integration with Plasma 5.7
    
    backport upstream commit 9449ec56d1fd77a0bfa1f7134a2bf4f91ffd14d3
---
 debian/changelog                                 |  4 +++
 debian/patches/backport_mpris2_desktopentry.diff | 37 ++++++++++++++++++++++++
 debian/patches/series                            |  1 +
 3 files changed, 42 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b300e49..6365c17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 amarok (2.8.0-6) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Backport upstream commit 9449ec56d1fd77a0bfa1f7134a2bf4f91ffd14d3 to fix
+    the MPRIS2 integration with Plasma 5.7; patch
+    backport_mpris2_desktopentry.diff.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 18 Sep 2016 18:55:25 +0200
 
diff --git a/debian/patches/backport_mpris2_desktopentry.diff b/debian/patches/backport_mpris2_desktopentry.diff
new file mode 100644
index 0000000..f5f1370
--- /dev/null
+++ b/debian/patches/backport_mpris2_desktopentry.diff
@@ -0,0 +1,37 @@
+From: Antonio Rojas <arojas at archlinux.org>
+Subject: Fix MPRIS2 DesktopEntry value
+Origin: backport, commit:9449ec56d1fd77a0bfa1f7134a2bf4f91ffd14d3
+Date: Sat, 20 Aug 2016 13:09:02 +0200
+Bug: https://bugs.kde.org/show_bug.cgi?id=365275
+
+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::Identity() const
+ 
+ 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
diff --git a/debian/patches/series b/debian/patches/series
index 03173db..bb70fb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,6 +2,7 @@ backport_dont_add_analyzer_when_not_supported.diff
 backport_dont_crash_on_shuffle_keyb_shortcut.diff
 backport_dont_allow_analyzer_with_vlc.diff
 backport_gcc6.diff
+backport_mpris2_desktopentry.diff
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
 debian_mysqle_force_defaults_file.diff

-- 
Amarok packaging