[arch-commits] Commit in kdelibs/repos (14 files)
Evangelos Foutras
foutrelis at archlinux.org
Sun Dec 6 09:56:55 UTC 2015
Date: Sunday, December 6, 2015 @ 10:56:54
Author: foutrelis
Revision: 252706
archrelease: copy trunk to staging-i686, staging-x86_64
Added:
kdelibs/repos/staging-i686/
kdelibs/repos/staging-i686/PKGBUILD
(from rev 252705, kdelibs/trunk/PKGBUILD)
kdelibs/repos/staging-i686/archlinux-menu.patch
(from rev 252705, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/staging-i686/kde-applications-menu.patch
(from rev 252705, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/staging-i686/kdelibs.install
(from rev 252705, kdelibs/trunk/kdelibs.install)
kdelibs/repos/staging-i686/qt4.patch
(from rev 252705, kdelibs/trunk/qt4.patch)
kdelibs/repos/staging-i686/taglib-1.10.patch
(from rev 252705, kdelibs/trunk/taglib-1.10.patch)
kdelibs/repos/staging-x86_64/
kdelibs/repos/staging-x86_64/PKGBUILD
(from rev 252705, kdelibs/trunk/PKGBUILD)
kdelibs/repos/staging-x86_64/archlinux-menu.patch
(from rev 252705, kdelibs/trunk/archlinux-menu.patch)
kdelibs/repos/staging-x86_64/kde-applications-menu.patch
(from rev 252705, kdelibs/trunk/kde-applications-menu.patch)
kdelibs/repos/staging-x86_64/kdelibs.install
(from rev 252705, kdelibs/trunk/kdelibs.install)
kdelibs/repos/staging-x86_64/qt4.patch
(from rev 252705, kdelibs/trunk/qt4.patch)
kdelibs/repos/staging-x86_64/taglib-1.10.patch
(from rev 252705, kdelibs/trunk/taglib-1.10.patch)
--------------------------------------------+
staging-i686/PKGBUILD | 65 +++++++++++++++++++++++++++
staging-i686/archlinux-menu.patch | 22 +++++++++
staging-i686/kde-applications-menu.patch | 22 +++++++++
staging-i686/kdelibs.install | 13 +++++
staging-i686/qt4.patch | 11 ++++
staging-i686/taglib-1.10.patch | 32 +++++++++++++
staging-x86_64/PKGBUILD | 65 +++++++++++++++++++++++++++
staging-x86_64/archlinux-menu.patch | 22 +++++++++
staging-x86_64/kde-applications-menu.patch | 22 +++++++++
staging-x86_64/kdelibs.install | 13 +++++
staging-x86_64/qt4.patch | 11 ++++
staging-x86_64/taglib-1.10.patch | 32 +++++++++++++
12 files changed, 330 insertions(+)
Copied: kdelibs/repos/staging-i686/PKGBUILD (from rev 252705, kdelibs/trunk/PKGBUILD)
===================================================================
--- staging-i686/PKGBUILD (rev 0)
+++ staging-i686/PKGBUILD 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.14.14
+_kdeappver=15.08.3
+pkgrel=3
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdelibs'
+license=('GPL' 'LGPL' 'FDL')
+depends=('attica-qt4' 'libxss' 'krb5' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
+ 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
+ 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')
+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' 'archlinux-menu.patch' 'qt4.patch' 'taglib-1.10.patch')
+sha1sums=('6d40602f048bcec658e86094abc17602d63c17f0'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+ '8aba7252966f68d4b2eae2a6300031fefbea6300')
+
+prepare() {
+ mkdir -p build
+ cd ${pkgname}-${pkgver}
+ # avoid file conflict with gnome-menus
+ patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i "${srcdir}"/archlinux-menu.patch
+ # qmake refers to Qt5
+ patch -p1 -i "${srcdir}"/qt4.patch
+ # Fix taglib 1.10 detection (Fedora)
+ patch -p1 -i ../taglib-1.10.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF \
+ -DWITH_SOLID_UDISKS2=ON
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # cert bundle seems to be hardcoded
+ # link it to the one from ca-certificates
+ rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}
Copied: kdelibs/repos/staging-i686/archlinux-menu.patch (from rev 252705, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- staging-i686/archlinux-menu.patch (rev 0)
+++ staging-i686/archlinux-menu.patch 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000
++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000
+@@ -16,11 +16,19 @@
+ </DefaultLayout>
+ <Layout>
+ <Merge type="menus"/>
++ <Menuname>Arch Linux</Menuname>
+ <Menuname>Applications</Menuname>
+ <Merge type="files"/>
+ </Layout>
+
+ <Menu>
++ <Name>Arch Linux</Name>
++ <Directory>Archlinux.directory</Directory>
++ <Include>
++ <Category>Archlinux</Category>
++ </Include>
++ </Menu>
++ <Menu>
+ <Name>Applications</Name>
+ <Directory>kde-unknown.directory</Directory>
+ <OnlyUnallocated/>
Copied: kdelibs/repos/staging-i686/kde-applications-menu.patch (from rev 252705, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- staging-i686/kde-applications-menu.patch (rev 0)
+++ staging-i686/kde-applications-menu.patch 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+ if (!m_trackId.isEmpty())
+ g_vfolder->setTrackId(m_trackId);
+
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+
+ KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
Copied: kdelibs/repos/staging-i686/kdelibs.install (from rev 252705, kdelibs/trunk/kdelibs.install)
===================================================================
--- staging-i686/kdelibs.install (rev 0)
+++ staging-i686/kdelibs.install 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdelibs/repos/staging-i686/qt4.patch (from rev 252705, kdelibs/trunk/qt4.patch)
===================================================================
--- staging-i686/qt4.patch (rev 0)
+++ staging-i686/qt4.patch 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~ 2013-03-07 16:57:29.735552097 +0000
++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
Copied: kdelibs/repos/staging-i686/taglib-1.10.patch (from rev 252705, kdelibs/trunk/taglib-1.10.patch)
===================================================================
--- staging-i686/taglib-1.10.patch (rev 0)
+++ staging-i686/taglib-1.10.patch 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,32 @@
+commit 967fc70300d5c2ae34d39b61757b717f6fca8805
+Author: Rex Dieter <rdieter at 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)
Copied: kdelibs/repos/staging-x86_64/PKGBUILD (from rev 252705, kdelibs/trunk/PKGBUILD)
===================================================================
--- staging-x86_64/PKGBUILD (rev 0)
+++ staging-x86_64/PKGBUILD 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,65 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars at archlinux.org>
+# Contributor: Andrea Scarpino <andrea at archlinux.org
+# Contributor: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=kdelibs
+pkgver=4.14.14
+_kdeappver=15.08.3
+pkgrel=3
+pkgdesc="KDE Core Libraries"
+arch=('i686' 'x86_64')
+url='https://projects.kde.org/projects/kde/kdelibs'
+license=('GPL' 'LGPL' 'FDL')
+depends=('attica-qt4' 'libxss' 'krb5' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
+ 'shared-mime-info' 'enchant' 'giflib' 'jasper' 'openexr' 'strigi'
+ 'docbook-xsl' 'upower' 'udisks2' 'libxcursor' 'phonon-qt4'
+ 'media-player-info' 'libxtst' 'libutempter' 'qtwebkit' 'icu')
+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' 'archlinux-menu.patch' 'qt4.patch' 'taglib-1.10.patch')
+sha1sums=('6d40602f048bcec658e86094abc17602d63c17f0'
+ '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
+ '63a850ab4196b9d06934f2b4a13acd9f7739bc67'
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+ '8aba7252966f68d4b2eae2a6300031fefbea6300')
+
+prepare() {
+ mkdir -p build
+ cd ${pkgname}-${pkgver}
+ # avoid file conflict with gnome-menus
+ patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+ # add Archlinux menu entry
+ patch -p1 -i "${srcdir}"/archlinux-menu.patch
+ # qmake refers to Qt5
+ patch -p1 -i "${srcdir}"/qt4.patch
+ # Fix taglib 1.10 detection (Fedora)
+ patch -p1 -i ../taglib-1.10.patch
+}
+
+build() {
+ cd build
+ cmake ../${pkgname}-${pkgver} \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DKDE4_BUILD_TESTS=OFF \
+ -DCMAKE_SKIP_RPATH=ON \
+ -DKDE_DISTRIBUTION_TEXT='Arch Linux' \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DSYSCONF_INSTALL_DIR=/etc \
+ -DLOCALE_INSTALL_DIR=/usr/share/locale/kde4 \
+ -DKDE_DEFAULT_HOME='.kde4' \
+ -DWITH_FAM=OFF \
+ -DWITH_SOLID_UDISKS2=ON
+ make
+}
+
+package() {
+ cd "${srcdir}"/build
+ make DESTDIR="${pkgdir}" install
+
+ # cert bundle seems to be hardcoded
+ # link it to the one from ca-certificates
+ rm -f "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+ ln -sf /etc/ssl/certs/ca-certificates.crt "${pkgdir}"/usr/share/apps/kssl/ca-bundle.crt
+}
Copied: kdelibs/repos/staging-x86_64/archlinux-menu.patch (from rev 252705, kdelibs/trunk/archlinux-menu.patch)
===================================================================
--- staging-x86_64/archlinux-menu.patch (rev 0)
+++ staging-x86_64/archlinux-menu.patch 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/applications.menu 2010-01-31 19:28:11.000000000 +0000
++++ kdelibs-4.3.98/kded/applications.menu 2010-01-31 22:25:53.556043077 +0000
+@@ -16,11 +16,19 @@
+ </DefaultLayout>
+ <Layout>
+ <Merge type="menus"/>
++ <Menuname>Arch Linux</Menuname>
+ <Menuname>Applications</Menuname>
+ <Merge type="files"/>
+ </Layout>
+
+ <Menu>
++ <Name>Arch Linux</Name>
++ <Directory>Archlinux.directory</Directory>
++ <Include>
++ <Category>Archlinux</Category>
++ </Include>
++ </Menu>
++ <Menu>
+ <Name>Applications</Name>
+ <Directory>kde-unknown.directory</Directory>
+ <OnlyUnallocated/>
Copied: kdelibs/repos/staging-x86_64/kde-applications-menu.patch (from rev 252705, kdelibs/trunk/kde-applications-menu.patch)
===================================================================
--- staging-x86_64/kde-applications-menu.patch (rev 0)
+++ staging-x86_64/kde-applications-menu.patch 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,22 @@
+--- kdelibs-4.3.98/kded/CMakeLists.txt 2009-10-02 14:55:17.000000000 +0000
++++ kdelibs-4.3.98/kded/CMakeLists.txt 2010-01-31 22:16:13.946933892 +0000
+@@ -69,7 +69,7 @@
+ if (WIN32)
+ install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
+ else (WIN32)
+-install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus )
++install( FILES applications.menu DESTINATION ${SYSCONF_INSTALL_DIR}/xdg/menus RENAME kde-applications.menu )
+ endif (WIN32)
+ install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
+ install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
+--- kdelibs-4.3.98/kded/kbuildsycoca.cpp 2009-12-04 23:10:18.000000000 +0000
++++ kdelibs-4.3.98/kded/kbuildsycoca.cpp 2010-01-31 22:16:13.962766572 +0000
+@@ -302,7 +302,7 @@
+ if (!m_trackId.isEmpty())
+ g_vfolder->setTrackId(m_trackId);
+
+- VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("applications.menu", true);
++ VFolderMenu::SubMenu *kdeMenu = g_vfolder->parseMenu("kde-applications.menu", true);
+
+ KServiceGroup::Ptr entry = g_bsgf->addNew("/", kdeMenu->directoryFile, KServiceGroup::Ptr(), false);
+ entry->setLayoutInfo(kdeMenu->layoutList);
Copied: kdelibs/repos/staging-x86_64/kdelibs.install (from rev 252705, kdelibs/trunk/kdelibs.install)
===================================================================
--- staging-x86_64/kdelibs.install (rev 0)
+++ staging-x86_64/kdelibs.install 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,13 @@
+post_install() {
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+ update-mime-database usr/share/mime &> /dev/null
+ update-desktop-database -q
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Copied: kdelibs/repos/staging-x86_64/qt4.patch (from rev 252705, kdelibs/trunk/qt4.patch)
===================================================================
--- staging-x86_64/qt4.patch (rev 0)
+++ staging-x86_64/qt4.patch 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,11 @@
+--- kdelibs-4.10.1/cmake/modules/FindQt4.cmake~ 2013-03-07 16:57:29.735552097 +0000
++++ kdelibs-4.10.1/cmake/modules/FindQt4.cmake 2013-03-07 16:57:52.038725421 +0000
+@@ -446,7 +446,7 @@
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
+-FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
++FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake4 qmake-qt4 qmake-mac PATHS
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+ "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\${qt_install_version};InstallDir]/bin"
Copied: kdelibs/repos/staging-x86_64/taglib-1.10.patch (from rev 252705, kdelibs/trunk/taglib-1.10.patch)
===================================================================
--- staging-x86_64/taglib-1.10.patch (rev 0)
+++ staging-x86_64/taglib-1.10.patch 2015-12-06 09:56:54 UTC (rev 252706)
@@ -0,0 +1,32 @@
+commit 967fc70300d5c2ae34d39b61757b717f6fca8805
+Author: Rex Dieter <rdieter at 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)
More information about the arch-commits
mailing list