aboutsummaryrefslogtreecommitdiffstats
path: root/main
diff options
context:
space:
mode:
authorNatanael Copa <ncopa@alpinelinux.org>2016-02-02 07:39:26 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2016-02-02 09:24:59 +0000
commitd728a3710f0a499fa71c78e7abd8a00ef6d20371 (patch)
tree954a0fc056b8b06c14612b3d4a2aa21b866c3c3c /main
parent051d52a6e815d5f00668153f4873ba9a73f2be65 (diff)
main/tomahawk: rebuild against boost-1.60
Diffstat (limited to 'main')
-rw-r--r--main/tomahawk/APKBUILD15
-rw-r--r--main/tomahawk/compare-taglib-version.patch35
2 files changed, 45 insertions, 5 deletions
diff --git a/main/tomahawk/APKBUILD b/main/tomahawk/APKBUILD
index f2f5092bcf0..59d18706867 100644
--- a/main/tomahawk/APKBUILD
+++ b/main/tomahawk/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer:
pkgname=tomahawk
pkgver=0.8.4
-pkgrel=3
+pkgrel=4
pkgdesc="A Music Player App written in C++/Qt"
url="http://tomahawk-player.org/"
arch="all"
@@ -16,7 +16,9 @@ makedepends="$depends_dev cmake sparsehash websocket++ automoc4 linux-headers
install=""
subpackages="$pkgname-dev"
source="http://download.tomahawk-player.org/tomahawk-$pkgver.tar.bz2
- musl-fixes.patch"
+ musl-fixes.patch
+ compare-taglib-version.patch
+ "
_builddir="$srcdir"/tomahawk-$pkgver
prepare() {
@@ -48,8 +50,11 @@ package() {
}
md5sums="04832abe1786edcc55805875b5882445 tomahawk-0.8.4.tar.bz2
-d544233b9cca0be6b4fda9855b8a4cfa musl-fixes.patch"
+d544233b9cca0be6b4fda9855b8a4cfa musl-fixes.patch
+c8765414d69411b557be371c12d8ee89 compare-taglib-version.patch"
sha256sums="0fb04bc6b7009e17186b3d384057939727c6f289d22f7f9a5ed2c9c9cd800449 tomahawk-0.8.4.tar.bz2
-a1797803b2db585b001ff21c9609d59cccf6451670e695da12ff66e6dc5e7d10 musl-fixes.patch"
+a1797803b2db585b001ff21c9609d59cccf6451670e695da12ff66e6dc5e7d10 musl-fixes.patch
+ecc8b0968d7787d9163b0dc3efbae44ffd1947f96948a3c26a798a83a18cafbe compare-taglib-version.patch"
sha512sums="5b312f593eac39d06de05e24d4ce429122d0777a9d52d6db8c65309ac283d7ae560c2fc189b186f0f8b1a7bbe1135ed0d59e1d850de6a93655e53efe4f5317c7 tomahawk-0.8.4.tar.bz2
-eaf3a13d6e664999820aa562921462ca51e3abea464fd4fba3864ac9cac723b13fa5d349feea88a4c44356348bab127dda0899fb6335e610a8e4f5172d55b1d9 musl-fixes.patch"
+eaf3a13d6e664999820aa562921462ca51e3abea464fd4fba3864ac9cac723b13fa5d349feea88a4c44356348bab127dda0899fb6335e610a8e4f5172d55b1d9 musl-fixes.patch
+a09e7d4e9bc684ca51714795716dd1756e490c2824371824313f53b0f0008c5fcfe95bceefd237d8d9c2b553760639848251770140739bc401b77a2b4e44c77c compare-taglib-version.patch"
diff --git a/main/tomahawk/compare-taglib-version.patch b/main/tomahawk/compare-taglib-version.patch
new file mode 100644
index 00000000000..ff8622536c2
--- /dev/null
+++ b/main/tomahawk/compare-taglib-version.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)