[SCM] Amarok packaging branch, master, updated. debian/2.8.0-4-15-g3546e8a

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 3546e8acdd65630a9b5fc4c54ee5ebee8e7a6186
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jun 28 06:28:36 2016 +0200

    fix build with GCC 6 (#822704)
    
    backport upstream commit 9308403e1c8484052f277bf6de32ee07c93a4beb
---
 debian/changelog                  |  2 ++
 debian/patches/backport_gcc6.diff | 31 +++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 7315521..1b32c8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ amarok (2.8.0-5) UNRELEASED; urgency=medium
   * Remove manual dh_builddeb invocation in rules, since the default
     compression is XZ already in stable.
   * Replace kdemultimedia-kio-plugins with kio-audiocd in README.Debian.
+  * Backport upstream commit 9308403e1c8484052f277bf6de32ee07c93a4beb to fix
+    build with GCC 6; patch backport_gcc6.diff. (Closes: #822704)
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 24 Jan 2016 16:19:34 +0100
 
diff --git a/debian/patches/backport_gcc6.diff b/debian/patches/backport_gcc6.diff
new file mode 100644
index 0000000..d202203
--- /dev/null
+++ b/debian/patches/backport_gcc6.diff
@@ -0,0 +1,31 @@
+From: Rex Dieter <rdieter at math.unl.edu>
+Subject: gcc6 buildfix
+Origin: backport, commit:9308403e1c8484052f277bf6de32ee07c93a4beb
+Date: Wed, 1 Jun 2016 13:58:26 -0500
+Bug: https://bugs.kde.org/show_bug.cgi?id=363054
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=822704
+Last-Update: 2016-06-28
+
+courtesy of opensuse, thx
+
+BUG: 363054
+
+--- a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
++++ b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp
+@@ -28,6 +28,7 @@
+ #include "playlist/PlaylistModelStack.h"
+ 
+ using namespace Playlists;
++using namespace Playlist;
+ 
+ XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad )
+     : PlaylistFile( url, provider )
+@@ -101,7 +102,7 @@ XSPFPlaylist::load()
+     //FIXME: this needs to be moved to whatever is creating the XSPFPlaylist
+     if( m_autoAppendAfterLoad )
+         The::playlistController()->insertPlaylist(
+-                    ::Playlist::ModelStack::instance()->bottom()->rowCount(),
++                    ModelStack::instance()->bottom()->rowCount(),
+                     Playlists::PlaylistPtr( this )
+                 );
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 5452e26..03173db 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,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
 debian_disable_qtscriptbindings_check_fix.diff
 debian_mysqle_amarok_local_errmsg_feature.diff
 debian_mysqle_force_defaults_file.diff

-- 
Amarok packaging