diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2016-01-06 04:35:50 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2016-01-06 04:37:02 +1100 |
| commit | c3c07f0eb712ff3739d91e8a1a244c3192b60ce1 (patch) | |
| tree | 2abf449cde4aa8aee8f64bf008b81d8b6a928e43 /media-sound/amarok | |
| parent | app-backup/obnam: revbump: add dep to unbreak with older paramiko, drop patch (diff) | |
| download | gentoo-c3c07f0eb712ff3739d91e8a1a244c3192b60ce1.tar.gz gentoo-c3c07f0eb712ff3739d91e8a1a244c3192b60ce1.tar.bz2 gentoo-c3c07f0eb712ff3739d91e8a1a244c3192b60ce1.zip | |
media-sound/amarok: backport patch from upstream fixing build with >=media-libs/taglib-1.10
Gentoo-bug: 571008
Package-Manager: portage-2.2.26
Diffstat (limited to 'media-sound/amarok')
| -rw-r--r-- | media-sound/amarok/amarok-2.8.0-r3.ebuild | 1 | ||||
| -rw-r--r-- | media-sound/amarok/files/amarok-2.8.0-taglib110.patch | 40 |
2 files changed, 41 insertions, 0 deletions
diff --git a/media-sound/amarok/amarok-2.8.0-r3.ebuild b/media-sound/amarok/amarok-2.8.0-r3.ebuild index ea7dcdf74149..30760bfc3c1f 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 000000000000..093481659fa6 --- /dev/null +++ b/media-sound/amarok/files/amarok-2.8.0-taglib110.patch @@ -0,0 +1,40 @@ +From: Omar Plummer <omarplummer@imergetechnologies.com> +Date: Thu, 06 Aug 2015 22:24:27 +0000 +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) + |