[arch-commits] Commit in soundkonverter/trunk (2 files)

[Antonio Rojas]

    Date: Monday, December 7, 2015 @ 17:50:35
  Author: arojas
Revision: 150045

Fix taglib 1.10 detection

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

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-07 16:47:47 UTC (rev 150044)
+++ PKGBUILD	2015-12-07 16:50:35 UTC (rev 150045)
@@ -32,9 +32,16 @@
             'wavpack: wavpack backend'
             'sox: sox plugin (change sample rate, various effects)')
 install=$pkgname.install
-source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz")
-md5sums=('4f09193d6602de7952b985b9505731f8')
+source=("http://kde-apps.org/CONTENT/content-files/29024-${pkgname}-${pkgver}.tar.gz" soundkonverter-taglib-1.10.patch)
+md5sums=('4f09193d6602de7952b985b9505731f8'
+         '9e95e0a090028c8e585a2c96b8a80734')
 
+prepare() {
+  cd $pkgname-$pkgver
+# Fix taglib 1.10 detection
+  patch -p1 -i ../soundkonverter-taglib-1.10.patch
+}
+
 build() {
   cd "$srcdir"/$pkgname-$pkgver
   cmake . \

Added: soundkonverter-taglib-1.10.patch
===================================================================
--- soundkonverter-taglib-1.10.patch	                        (rev 0)
+++ soundkonverter-taglib-1.10.patch	2015-12-07 16:50:35 UTC (rev 150045)
@@ -0,0 +1,24 @@
+--- soundkonverter-2.1.2/cmake/modules/FindTaglib.cmake.orig	2015-12-07 17:46:20.470042447 +0100
++++ soundkonverter-2.1.2/cmake/modules/FindTaglib.cmake	2015-12-07 17:47:37.743822877 +0100
+@@ -29,10 +29,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)
+ 
+@@ -42,7 +42,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)