media-sound/tomahawk: backport patch from upstream solving build failure with >=media...

Gentoo-bug: 574078

Package-Manager: portage-2.2.27

diff --git a/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch b/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch
new file mode 100644 (file)
index 0000000..ff86225
--- /dev/null
+++ b/media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch
@@ -0,0 +1,35 @@
+From ee4656383a92a78299aff6f8637f174fff328e98 Mon Sep 17 00:00:00 2001
+From: Pinak Ahuja <pinak.ahuja@gmail.com>
+Date: Wed, 2 Sep 2015 14:41:00 +0530
+Subject: [PATCH] Compare taglib version properly
+
+---
+ CMakeModules/FindTaglib.cmake | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeModules/FindTaglib.cmake b/CMakeModules/FindTaglib.cmake
+index e0efbef..f54ff78 100644
+--- a/CMakeModules/FindTaglib.cmake
++++ b/CMakeModules/FindTaglib.cmake
+@@ -34,10 +34,10 @@ ELSE()
+ 
+         exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION)
+ 
+-        if(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++        if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+                message(STATUS "TagLib version not found: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}")
+                set(TAGLIB_FOUND FALSE)
+-        else(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}")
++        else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+ 
+                exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES)
+ 
+@@ -48,7 +48,7 @@ ELSE()
+ #                     message(STATUS "Found taglib: ${TAGLIB_LIBRARIES}")
+                endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS)
+                string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}")
+-        endif(TAGLIB_VERSION STRLESS "${TAGLIB_MIN_VERSION}") 
++        endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}")
+         mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+       else(TAGLIBCONFIG_EXECUTABLE)

diff --git a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
index 30323bd0e6368f702b62daa9a463f47be5356179..77374a3cb1c0ac3fe07860758ee34bd1a08c210e 100644 (file)
--- a/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
+++ b/media-sound/tomahawk/tomahawk-0.8.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -74,7 +74,10 @@ RDEPEND="${DEPEND}
 
 DOCS=( AUTHORS ChangeLog README.md )
 
-PATCHES=( "${FILESDIR}/${P}-qt55.patch" )
+PATCHES=(
+       "${FILESDIR}/${P}-qt55.patch"
+       "${FILESDIR}/${P}-taglib-1.10.patch"
+)
 
 src_configure() {
        local mycmakeargs=(