extra/kdelibs to 4.14.14-2

This commit is contained in:
Kevin Mihelich 2015-11-20 01:35:52 +00:00
parent c938f26021
commit 0c4057b5a2
2 changed files with 37 additions and 2 deletions

View file

@ -9,7 +9,7 @@
pkgname=kdelibs
pkgver=4.14.14
_kdeappver=15.08.3
pkgrel=1
pkgrel=2
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs'
@ -21,12 +21,13 @@ depends=('attica-qt4' 'libxss' 'krb5' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa' 'grantlee-qt4')
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'
'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch' 'taglib-1.10.patch'
'arm-coronaoffscreen-input-fixes.diff')
sha1sums=('6d40602f048bcec658e86094abc17602d63c17f0'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
'ed1f57ee661e5c7440efcaba7e51d2554709701c'
'8aba7252966f68d4b2eae2a6300031fefbea6300'
'855150096763600c970aa307c8241b96da33b9ed')
prepare() {
@ -38,6 +39,8 @@ prepare() {
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
# fix unclickable plasmoid buttons on ARM
patch -p1 -i "${srcdir}"/arm-coronaoffscreen-input-fixes.diff
}

View file

@ -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)