kdelibs-4.14.15-1.parabola1: updating version

2 files changed, 17 insertions, 52 deletions

diff --git a/libre/kdelibs/PKGBUILD b/libre/kdelibs/PKGBUILD
index 37e2f785f..84bdaba1f 100644
--- a/libre/kdelibs/PKGBUILD
+++ b/libre/kdelibs/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 252816 2015-12-06 12:56:07Z bpiotrowski $
+# $Id: PKGBUILD 256471 2015-12-16 12:44:18Z arojas $
 # Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
 # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org
 # Contributor (Arch): Pierre Schmitz <pierre@archlinux.de>
 # Maintainer: André Silva <emulatorman@parabola.nu>
 
 pkgname=kdelibs
-pkgver=4.14.14
-_kdeappver=15.08.3
-pkgrel=4.parabola1
+pkgver=4.14.15
+_kdeappver=15.12.0
+pkgrel=1.parabola1
 pkgdesc="KDE Core Libraries, without nonfree plugins recommendation support"
 arch=('i686' 'x86_64')
 url='https://projects.kde.org/projects/kde/kdelibs'
@@ -19,31 +19,28 @@ depends=('attica-qt4' 'libxss' 'krb5' 'qca-qt4' 'libdbusmenu-qt4' 'polkit-qt4'
         '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' 'khtml-fsdg.diff' 'qt4.patch' 'taglib-1.10.patch')
-sha1sums=('6d40602f048bcec658e86094abc17602d63c17f0'
+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')
+sha1sums=('7a50824fbcd2a4a72c8780da7b1425b038415419'
           '86ee8c8660f19de8141ac99cd6943964d97a1ed7'
           'a1502a964081ad583a00cf90c56e74bf60121830'
-          'ed1f57ee661e5c7440efcaba7e51d2554709701c'
-          '8aba7252966f68d4b2eae2a6300031fefbea6300')
+          'ed1f57ee661e5c7440efcaba7e51d2554709701c')
 
 prepare() {
        mkdir -p build
        cd ${pkgname}-${pkgver}
        # avoid file conflict with gnome-menus
-       patch -p1 -i "${srcdir}"/kde-applications-menu.patch
+       patch -p1 -i ../kde-applications-menu.patch
        # don't ask the user to download a plugin, it's probably nonfree
-       patch -p1 -i "${srcdir}"/khtml-fsdg.diff
+       patch -p1 -i ../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
+       patch -p1 -i ../qt4.patch
 }
 
 build() {
        cd build
-       cmake ../${pkgname}-${pkgver} \
+       cmake ../$pkgname-$pkgver \
                -DCMAKE_BUILD_TYPE=Release \
                -DKDE4_BUILD_TESTS=OFF \
                -DCMAKE_SKIP_RPATH=ON \
@@ -58,11 +55,11 @@ build() {
 }
 
 package() {
-       cd "${srcdir}"/build
-       make DESTDIR="${pkgdir}" install
+       cd 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
+       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
 }
diff --git a/libre/kdelibs/taglib-1.10.patch b/libre/kdelibs/taglib-1.10.patch
deleted file mode 100644
index bde8d2bc4..000000000
--- a/libre/kdelibs/taglib-1.10.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-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)