svn commit: r363295 - head/audio/amarok-kde4/files

[Raphael Kubo da Costa]

Author: rakuco
Date: Tue Jul 29 06:58:24 2014
New Revision: 363295
URL: http://svnweb.freebsd.org/changeset/ports/363295
QAT: https://qat.redports.org/buildarchive/r363295/

Log:
  Add patches to fix the build with base's ancient GCC.
  
  In practice, this fixes the build on 8 and 9 when clang is not used. There
  is no need to submit the patches upstream because the next version of Amarok
  will already require a C++11 compiler, which makes the problems disappear.
  
  I didn't feel the need to bump PORTREVISION because the generated code
  should be the same, and users who had already managed to build Amarok don't
  need to rebuild it.
  
  PR:		192159
  Submitted by:	freebsd at chillt.de

Added:
  head/audio/amarok-kde4/files/patch-src__core-impl__playlists__types__file__xspf__XSPFPlaylist.cpp   (contents, props changed)
  head/audio/amarok-kde4/files/patch-src__playlist__proxymodels__SortScheme.cpp   (contents, props changed)

Added: head/audio/amarok-kde4/files/patch-src__core-impl__playlists__types__file__xspf__XSPFPlaylist.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/amarok-kde4/files/patch-src__core-impl__playlists__types__file__xspf__XSPFPlaylist.cpp	Tue Jul 29 06:58:24 2014	(r363295)
@@ -0,0 +1,19 @@
+--- src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp.orig	2014-07-27 18:29:25.000000000 +0200
++++ src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp	2014-07-27 18:29:43.000000000 +0200
+@@ -27,6 +27,7 @@
+ #include "playlist/PlaylistController.h"
+ #include "playlist/PlaylistModelStack.h"
+ 
++using Playlist::ModelStack;
+ using namespace Playlists;
+ 
+ XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad )
+@@ -101,7 +102,7 @@
+     //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 )
+                 );
+ }

Added: head/audio/amarok-kde4/files/patch-src__playlist__proxymodels__SortScheme.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/audio/amarok-kde4/files/patch-src__playlist__proxymodels__SortScheme.cpp	Tue Jul 29 06:58:24 2014	(r363295)
@@ -0,0 +1,18 @@
+--- src/playlist/proxymodels/SortScheme.cpp.orig	2014-07-27 18:27:06.000000000 +0200
++++ src/playlist/proxymodels/SortScheme.cpp	2014-07-27 18:27:44.000000000 +0200
+@@ -123,13 +123,13 @@
+ SortScheme::const_iterator
+ SortScheme::begin() const
+ {
+-    return QStack::begin();
++    return QStack<SortLevel>::begin();
+ }
+ 
+ SortScheme::const_iterator
+ SortScheme::end() const
+ {
+-    return QStack::end();
++    return QStack<SortLevel>::end();
+ }
+ 
+ }   //namespace Playlist