diff options
| author | David Spencer <idlemoor@slackbuilds.org> | 2016-04-10 10:55:09 +0100 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2016-04-12 17:34:23 +0700 |
| commit | ea83d28f913d9689959dea5ef7ba98938bbf6047 (patch) | |
| tree | 6234f881363e9af4c0a80a5fed24bcd74b0cd657 | |
| parent | eccef44bb7964b6415bc4df49c3f91670dac1243 (diff) | |
multimedia/tomahawk: Fixed build with taglib-1.10.
Signed-off-by: David Spencer <idlemoor@slackbuilds.org>
| -rw-r--r-- | multimedia/tomahawk/ee4656383a92a78299aff6f8637f174fff328e98.patch | 35 | ||||
| -rw-r--r-- | multimedia/tomahawk/tomahawk.SlackBuild | 4 | ||||
| -rw-r--r-- | multimedia/tomahawk/tomahawk.info | 2 |
3 files changed, 40 insertions, 1 deletions
diff --git a/multimedia/tomahawk/ee4656383a92a78299aff6f8637f174fff328e98.patch b/multimedia/tomahawk/ee4656383a92a78299aff6f8637f174fff328e98.patch new file mode 100644 index 000000000000..ff8622536c23 --- /dev/null +++ b/multimedia/tomahawk/ee4656383a92a78299aff6f8637f174fff328e98.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/multimedia/tomahawk/tomahawk.SlackBuild b/multimedia/tomahawk/tomahawk.SlackBuild index 20881db79fe8..1eab335d7c2e 100644 --- a/multimedia/tomahawk/tomahawk.SlackBuild +++ b/multimedia/tomahawk/tomahawk.SlackBuild @@ -69,6 +69,10 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# Compare taglib version properly (fix for taglib-1.10) +# https://github.com/tomahawk-player/tomahawk/commit/ee4656383a92a78299aff6f8637f174fff328e98 +patch -p1 < $CWD/ee4656383a92a78299aff6f8637f174fff328e98.patch + mkdir -p build cd build cmake \ diff --git a/multimedia/tomahawk/tomahawk.info b/multimedia/tomahawk/tomahawk.info index 4226b3047b70..f2a27c392a81 100644 --- a/multimedia/tomahawk/tomahawk.info +++ b/multimedia/tomahawk/tomahawk.info @@ -1,6 +1,6 @@ PRGNAM="tomahawk" VERSION="0.8.4" -HOMEPAGE="tomahawk-player.org" +HOMEPAGE="https://www.tomahawk-player.org/" DOWNLOAD="http://download.tomahawk-player.org/tomahawk-0.8.4.tar.bz2" MD5SUM="04832abe1786edcc55805875b5882445" DOWNLOAD_x86_64="" |