Merge branch 'testing' of ssh://git.chakraos.org:86/desktop into testing

digikam/PKGBUILD

@@ -1,7 +1,7 @@
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins' 'libkvkontakte')
-pkgver=4.7.0
-pkgrel=2
+pkgver=4.8.0
+pkgrel=1
 url="http://digikam.sourceforge.net"
 arch=('x86_64')
 license=('GPL')
@@ -10,9 +10,9 @@ makedepends=('kde-runtime' 'kdegraphics-kgamma' 'kdepimlibs' 'lensfun' 'kdeedu-m
              'liblqr' 'opencv' 'lapack' 'libgpod' 'pkgconfig' 'cmake' 'automoc4'
              'doxygen' 'docbook-xsl' 'qjson' 'kdegraphics-libkexiv2' 'kdegraphics-libkdcraw'
              'kdegraphics-libksane' 'mariadb' 'qt-gstreamer' 'boost' 'hugin-tools' 'eigen3' 'libbluray' 'baloo' 'libpgf')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}-1.tar.bz2")
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
 options=("debug")
-md5sums=('7ddee71d580153125ec08fba6b9b620c')
+md5sums=('2a869d4007577c7df090afcdea2fab97')
 
 build() {
    cd ${srcdir}

digikam/libkexiv2.patch

@@ -1,10 +0,0 @@
---- extra/CMakeLists.txt.bak	2014-11-14 20:46:49.265601687 +0100
-+++ extra/CMakeLists.txt	2014-11-14 20:46:55.555823691 +0100
-@@ -11,7 +11,6 @@
- 
-     # from kdegraphics/libs
-     add_subdirectory(libkipi)
--    add_subdirectory(libkexiv2)
-     add_subdirectory(libkdcraw)
-     add_subdirectory(libkface)
-     MACRO_OPTIONAL_ADD_SUBDIRECTORY(libksane)