[gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/files/, media-sound/amarok/
commit: 8bfde08d22c3e55127883857d4ac46bbe4efa164
Author: Johannes Huber gentoo org>
AuthorDate: Wed Jun 1 19:14:58 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed Jun 1 19:15:10 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8bfde08d
media-sound/amarok: Fix build w/ gcc-6
By adding upstreamed patch from opensuse.
Gentoo-bug: 584682
Package-Manager: portage-2.3.0_rc1
media-sound/amarok/amarok-2.8.90-r2.ebuild| 1 +
media-sound/amarok/files/amarok-2.8.90-gcc6.patch | 36 +++
2 files changed, 37 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.90-r2.ebuild
b/media-sound/amarok/amarok-2.8.90-r2.ebuild
index 04e5ff6..03a5e12 100644
--- a/media-sound/amarok/amarok-2.8.90-r2.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r2.ebuild
@@ -77,6 +77,7 @@ PATCHES=(
"${FILESDIR}/${P}-mysql-embedded.patch"
"${FILESDIR}/${P}-mysqld-rpath.patch"
"${FILESDIR}/${P}-scriptconsole.patch"
+ "${FILESDIR}/${P}-gcc6.patch"
)
src_configure() {
diff --git a/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
new file mode 100644
index 000..bad936a
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-gcc6.patch
@@ -0,0 +1,36 @@
+From 9308403e1c8484052f277bf6de32ee07c93a4beb Mon Sep 17 00:00:00 2001
+From: Rex Dieter
+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
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/files/, media-sound/amarok/
commit: 6615126d2da5b99b1fd8dff7832114cbf1f2dc25
Author: Johannes Huber gentoo org>
AuthorDate: Wed May 4 20:00:55 2016 +
Commit: Johannes Huber gentoo org>
CommitDate: Wed May 4 20:06:59 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6615126d
media-sound/amarok: Fix rpath on mysqld
Patch rebased for current version by Peter Levine
gmail.com>, was unfortunately dropped in kde overlay for
version bump.
Gentoo-bug: 581554
Package-Manager: portage-2.2.28
.../amarok/{amarok-2.8.90.ebuild => amarok-2.8.90-r1.ebuild} | 4
media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch| 12
2 files changed, 16 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.90.ebuild
b/media-sound/amarok/amarok-2.8.90-r1.ebuild
similarity index 94%
rename from media-sound/amarok/amarok-2.8.90.ebuild
rename to media-sound/amarok/amarok-2.8.90-r1.ebuild
index 4db4e97..3012de2 100644
--- a/media-sound/amarok/amarok-2.8.90.ebuild
+++ b/media-sound/amarok/amarok-2.8.90-r1.ebuild
@@ -75,6 +75,7 @@ RDEPEND="${COMMONDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-2.8.0-taglib110.patch"
"${FILESDIR}/${P}-mysql-embedded.patch"
+ "${FILESDIR}/${P}-mysqld-rpath.patch"
)
src_configure() {
@@ -97,6 +98,9 @@ src_configure() {
-DWITH_UTILITIES=$(usex utils)
)
+ # bug 581554: add libmysqld location for rpath patch
+ use embedded && mycmakeargs+=(
-DMYSQLD_DIR="${EPREFIX}/usr/$(get_libdir)/mysql" )
+
kde4-base_src_configure
}
diff --git a/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
new file mode 100644
index 000..c84975d
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.90-mysqld-rpath.patch
@@ -0,0 +1,12 @@
+--- a/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt.old
2016-05-04 11:01:25.0 -0400
b/src/core-impl/storage/sql/mysqlestorage/CMakeLists.txt 2016-05-04
11:05:24.216625165 -0400
+@@ -28,6 +28,9 @@
+ ${ZLIB_LIBRARIES}
+ )
+
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES
BUILD_WITH_INSTALL_RPATH TRUE)
++SET_TARGET_PROPERTIES(amarok_storage-mysqlestorage PROPERTIES INSTALL_RPATH
"${MYSQLD_DIR}")
++
+ if(NOT WIN32 AND NOT APPLE)
+ target_link_libraries( amarok_storage-mysqlserverstorage crypt pthread )
+ endif(NOT WIN32 AND NOT APPLE)
[gentoo-commits] repo/gentoo:master commit in: media-sound/amarok/files/, media-sound/amarok/
commit: c3c07f0eb712ff3739d91e8a1a244c3192b60ce1
Author: Michael Palimaka gentoo org>
AuthorDate: Tue Jan 5 17:35:50 2016 +
Commit: Michael Palimaka gentoo org>
CommitDate: Tue Jan 5 17:37:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c3c07f0e
media-sound/amarok: backport patch from upstream fixing build with
>=media-libs/taglib-1.10
Gentoo-bug: 571008
Package-Manager: portage-2.2.26
media-sound/amarok/amarok-2.8.0-r3.ebuild | 1 +
.../amarok/files/amarok-2.8.0-taglib110.patch | 40 ++
2 files changed, 41 insertions(+)
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild
b/media-sound/amarok/amarok-2.8.0-r3.ebuild
index ea7dcdf..30760bf 100644
--- a/media-sound/amarok/amarok-2.8.0-r3.ebuild
+++ b/media-sound/amarok/amarok-2.8.0-r3.ebuild
@@ -81,6 +81,7 @@ RDEPEND="${COMMONDEPEND}
PATCHES=(
"${FILESDIR}/${P}-gmock-1.7.patch"
"${FILESDIR}/${P}-mysqld-rpath.patch"
+ "${FILESDIR}/${P}-taglib110.patch"
)
src_configure() {
diff --git a/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
new file mode 100644
index 000..0934816
--- /dev/null
+++ b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch
@@ -0,0 +1,40 @@
+From: Omar Plummer
+Date: Thu, 06 Aug 2015 22:24:27 +
+Subject: Fix TagLib version check.
+X-Git-Url:
http://quickgit.kde.org/?p=amarok.git&a=commitdiff&h=fec8817c530ce42b6485fdabff6051784b8d9904
+---
+Fix TagLib version check.
+
+The version check compared version strings lexicographically, so "1.7"
+(the min version) compared as greater than "1.10.0".
+
+BUG: 351013
+REVIEW: 124639
+---
+
+
+--- a/cmake/modules/FindTaglib.cmake
b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE
_return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+
+- if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ if("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ message(STATUS "TagLib version too old: version searched
:${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+ set(TAGLIB_FOUND FALSE)
+- else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ else("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+
+ exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE
_return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+
+@@ -42,7 +42,7 @@
+ set(TAGLIB_FOUND TRUE)
+ endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+ string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+- endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++ endif("${TAGLIB_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+ mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+
+ else(TAGLIBCONFIG_EXECUTABLE)
+
