kdelibs-4.14.14-2.parabola1: fix taglib 1.10 detection

2 files changed, 39 insertions, 4 deletions

diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD
index 8fb512dd8..177210c7b 100644
--- a/libre/kdelibs/PKGBUILD
+++ b/libre/kdelibs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 250288 2015-11-09 21:13:39Z arojas $
+# $Id: PKGBUILD 251254 2015-11-19 18:46:51Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
@@ -7,7 +7,7 @@
 pkgname=kdelibs
 pkgver=4.14.14
 _kdeappver=15.08.3
-pkgrel=1.parabola1
+pkgrel=2.parabola1
 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -21,11 +21,12 @@ depends=('attica-qt4' 'libxss' 'krb5' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
 makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/applications/${_kdeappver}/src/${pkgname}-${pkgver}.tar.xz"
-        'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch')
+        'kde-applications-menu.patch' 'khtml-fsdg.diff' 'qt4.patch' 'taglib-1.10.patch')
 sha1sums=('6d40602f048bcec658e86094abc17602d63c17f0'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'a1502a964081ad583a00cf90c56e74bf60121830'
-          'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+          '8aba7252966f68d4b2eae2a6300031fefbea6300')
 
 prepare() {
        mkdir -p build
@@ -36,6 +37,8 @@ prepare() {
        patch -p1 -i "${srcdir}"/khtml-fsdg.diff
        # qmake refers to Qt5
        patch -p1 -i "${srcdir}"/qt4.patch
+       # fix taglib 1.10 detection (Fedora)
+       patch -p1 -i ../taglib-1.10.patch
 }
 
 build() {
diff --git a/libre/kdelibs/taglib-1.10.patch b/libre/kdelibs/taglib-1.10.patch
new file mode 100644
index 000000000..bde8d2bc4
--- /dev/null
+++ b/libre/kdelibs/taglib-1.10.patch
@@ -0,0 +1,32 @@
+commit 967fc70300d5c2ae34d39b61757b717f6fca8805
+Author: Rex Dieter <rdieter@math.unl.edu>
+Date:   Sat Nov 7 06:54:26 2015 -0600
+
+    FindTaglib.cmake: fix version detection for 1.10
+
+diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake
+index 5bbb8ee..4319d6b 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 not found: 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)
+ 
+@@ -43,7 +43,7 @@ if(TAGLIBCONFIG_EXECUTABLE)
+         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_MIN_VERSION}" VERSION_GREATER TAGLIB_VERSION)
+   mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES)
+ 
+ else(TAGLIBCONFIG_EXECUTABLE)