[arch-commits] Commit in amarok/trunk (PKGBUILD taglib_version_detect.patch)

[Felix Yan]

    Date: Monday, December 7, 2015 @ 15:57:57
  Author: fyan
Revision: 253394

fix taglib version detect (https://bugs.kde.org/show_bug.cgi?id=351013)

Added:
  amarok/trunk/taglib_version_detect.patch
Modified:
  amarok/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |    9 +++++++--
 taglib_version_detect.patch |   26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-12-07 14:57:52 UTC (rev 253393)
+++ PKGBUILD	2015-12-07 14:57:57 UTC (rev 253394)
@@ -22,11 +22,16 @@
             "clamz: allow to download songs from Amazon.com"
             "gst-libav: MP3 codecs")
 install="${pkgname}.install"
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2"
+        taglib_version_detect.patch)
+sha1sums=('e76ccd53c05d57f9457d74cd08c2c41383c00937'
+          '8b2752a0fe78621bdb9ccdb763919ea265b52b06')
 
 prepare() {
   mkdir build
+
+  cd ${pkgname}-${pkgver}
+  patch -p1 ../taglib_version_detect.patch
 }
 
 build() {

Added: taglib_version_detect.patch
===================================================================
--- taglib_version_detect.patch	                        (rev 0)
+++ taglib_version_detect.patch	2015-12-07 14:57:57 UTC (rev 253394)
@@ -0,0 +1,26 @@
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 76b83ac..21a10a8 100644
+--- a/cmake/modules/FindTaglib.cmake
++++ b/cmake/modules/FindTaglib.cmake
+@@ -29,10 +29,10 @@ if(TAGLIBCONFIG_EXECUTABLE)
+ 
+   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 @@ if(TAGLIBCONFIG_EXECUTABLE)
+         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)