[arch-commits] Commit in cantata/trunk (PKGBUILD taglib-1.10.patch)

[Antonio Rojas]

    Date: Sunday, December 20, 2015 @ 16:05:48
  Author: arojas
Revision: 153775

Fix taglib detection (FS#47454)

Added:
  cantata/trunk/taglib-1.10.patch
Modified:
  cantata/trunk/PKGBUILD

-------------------+
 PKGBUILD          |   13 +++++++++----
 taglib-1.10.patch |   24 ++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2015-12-20 14:06:04 UTC (rev 153774)
+++ PKGBUILD    2015-12-20 15:05:48 UTC (rev 153775)
@@ -6,7 +6,7 @@
 
 pkgname=cantata
 pkgver=1.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Qt5 client for the music player daemon (MPD)'
 arch=('i686' 'x86_64')
 url='https://code.google.com/p/cantata/'
@@ -16,11 +16,16 @@
 optdepends=('perl-uri: dynamic playlist' 'mpd: playback' 'ffmpeg: ReplayGain 
support')
 makedepends=('cmake' 'qt5-tools' 'qt5-svg' 'ffmpeg')
 install=$pkgname.install
-source=("${pkgname}-${pkgver}.tar.bz2::https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E";)
-md5sums=('0b29d30f1b03ecac23eb608309fbeaa1')
+source=("${pkgname}-${pkgver}.tar.bz2::https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60LV9rM3RMQk85Z1E";
 taglib-1.10.patch)
+md5sums=('0b29d30f1b03ecac23eb608309fbeaa1'
+         'af5aa1d31e78480289719b165d69f1b5')
 
 prepare() {
-  mkdir build
+  mkdir -p build
+
+# Fix taglib 1.10 detection
+  cd $pkgname-$pkgver
+  patch -p1 -i ../taglib-1.10.patch
 }
 
 build() {

Added: taglib-1.10.patch
===================================================================
--- taglib-1.10.patch                           (rev 0)
+++ taglib-1.10.patch   2015-12-20 15:05:48 UTC (rev 153775)
@@ -0,0 +1,24 @@
+--- cantata-1.5.2/cmake/FindTaglib.cmake.orig  2015-12-20 15:55:18.673152130 
+0100
++++ cantata-1.5.2/cmake/FindTaglib.cmake       2015-12-20 15:56:21.766649006 
+0100
+@@ -31,10 +31,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)
+ 
+@@ -44,7 +44,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)