summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Palimaka <kensington@gentoo.org>2016-02-10 02:07:14 +1100
committerMichael Palimaka <kensington@gentoo.org>2016-02-10 02:07:58 +1100
commitb286a18e55066222770c7fa341a5fef0afcd0239 (patch)
tree8bd683494c4e49069da92880d0701709e72ba3fa /media-sound/tomahawk/files
parentsys-apps/hwinfo: READMEs are renamed (diff)
downloadgentoo-b286a18e55066222770c7fa341a5fef0afcd0239.tar.gz
gentoo-b286a18e55066222770c7fa341a5fef0afcd0239.tar.bz2
gentoo-b286a18e55066222770c7fa341a5fef0afcd0239.zip
media-sound/tomahawk: backport patch from upstream solving build failure with >=media-libs/taglib-1.10
Gentoo-bug: 574078 Package-Manager: portage-2.2.27
Diffstat (limited to 'media-sound/tomahawk/files')
-rw-r--r--media-sound/tomahawk/files/tomahawk-0.8.4-taglib-1.10.patch35
1 files changed, 35 insertions, 0 deletions
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
index 000000000000..ff8622536c23
--- /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)