| 1 |
commit: 8bfde08d22c3e55127883857d4ac46bbe4efa164 |
| 2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jun 1 19:14:58 2016 +0000 |
| 4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 1 19:15:10 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfde08d |
| 7 |
|
| 8 |
media-sound/amarok: Fix build w/ gcc-6 |
| 9 |
|
| 10 |
By adding upstreamed patch from opensuse. |
| 11 |
|
| 12 |
Gentoo-bug: 584682 |
| 13 |
|
| 14 |
Package-Manager: portage-2.3.0_rc1 |
| 15 |
|
| 16 |
media-sound/amarok/amarok-2.8.90-r2.ebuild | 1 + |
| 17 |
media-sound/amarok/files/amarok-2.8.90-gcc6.patch | 36 +++++++++++++++++++++++ |
| 18 |
2 files changed, 37 insertions(+) |
| 19 |
|
| 20 |
diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild b/media-sound/amarok/amarok-2.8.90-r2.ebuild |
| 21 |
index 04e5ff6..03a5e12 100644 |
| 22 |
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild |
| 23 |
+++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild |
| 24 |
@@ -77,6 +77,7 @@ PATCHES=( |
| 25 |
"${FILESDIR}/${P}-mysql-embedded.patch" |
| 26 |
"${FILESDIR}/${P}-mysqld-rpath.patch" |
| 27 |
"${FILESDIR}/${P}-scriptconsole.patch" |
| 28 |
+ "${FILESDIR}/${P}-gcc6.patch" |
| 29 |
) |
| 30 |
|
| 31 |
src_configure() { |
| 32 |
|
| 33 |
diff --git a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch |
| 34 |
new file mode 100644 |
| 35 |
index 0000000..bad936a |
| 36 |
--- /dev/null |
| 37 |
+++ b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch |
| 38 |
@@ -0,0 +1,36 @@ |
| 39 |
+From 9308403e1c8484052f277bf6de32ee07c93a4beb Mon Sep 17 00:00:00 2001 |
| 40 |
+From: Rex Dieter <rdieter@××××××××.edu> |
| 41 |
+Date: Wed, 1 Jun 2016 13:58:26 -0500 |
| 42 |
+Subject: [PATCH] gcc6 buildfix |
| 43 |
+ |
| 44 |
+courtesy of opensuse, thx |
| 45 |
+ |
| 46 |
+BUG: 363054 |
| 47 |
+--- |
| 48 |
+ src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp | 3 ++- |
| 49 |
+ 1 file changed, 2 insertions(+), 1 deletion(-) |
| 50 |
+ |
| 51 |
+diff --git a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp |
| 52 |
+index 4bdb9b9..e327354 100644 |
| 53 |
+--- a/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp |
| 54 |
++++ b/src/core-impl/playlists/types/file/xspf/XSPFPlaylist.cpp |
| 55 |
+@@ -28,6 +28,7 @@ |
| 56 |
+ #include "playlist/PlaylistModelStack.h" |
| 57 |
+ |
| 58 |
+ using namespace Playlists; |
| 59 |
++using namespace Playlist; |
| 60 |
+ |
| 61 |
+ XSPFPlaylist::XSPFPlaylist( const KUrl &url, Playlists::PlaylistProvider *provider, OnLoadAction onLoad ) |
| 62 |
+ : PlaylistFile( url, provider ) |
| 63 |
+@@ -101,7 +102,7 @@ XSPFPlaylist::load() |
| 64 |
+ //FIXME: this needs to be moved to whatever is creating the XSPFPlaylist |
| 65 |
+ if( m_autoAppendAfterLoad ) |
| 66 |
+ The::playlistController()->insertPlaylist( |
| 67 |
+- ::Playlist::ModelStack::instance()->bottom()->rowCount(), |
| 68 |
++ ModelStack::instance()->bottom()->rowCount(), |
| 69 |
+ Playlists::PlaylistPtr( this ) |
| 70 |
+ ); |
| 71 |
+ } |
| 72 |
+-- |
| 73 |
+2.8.3 |
| 74 |
+ |
Archives