forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-sound/amarok: Fix build w/ gcc-6
By adding upstreamed patch from opensuse. Gentoo-bug: 584682 Package-Manager: portage-2.3.0_rc1
- Loading branch information
Showing
2 changed files
with
37 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
From 9308403e1c8484052f277bf6de32ee07c93a4beb Mon Sep 17 00:00:00 2001 | ||
From: Rex Dieter <[email protected]> | ||
Date: Wed, 1 Jun 2016 13:58:26 -0500 | ||
Subject: [PATCH] gcc6 buildfix | ||
|
||
courtesy of opensuse, thx | ||
|
||
BUG: 363054 | ||
--- | ||
src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp | ||
index 4bdb9b9..e327354 100644 | ||
--- 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 ) | ||
); | ||
} | ||
-- | ||
2.8.3 | ||
|