[arch-commits] Commit in digikam/trunk (PKGBUILD)

[Antonio Rojas]

    Date: Tuesday, June 16, 2015 @ 00:13:20
  Author: arojas
Revision: 240935

Update to 4.11.0, switch to external libkvkontakte

Modified:
  digikam/trunk/PKGBUILD

----------+
 PKGBUILD |   25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-06-15 21:33:47 UTC (rev 240934)
+++ PKGBUILD	2015-06-15 22:13:20 UTC (rev 240935)
@@ -4,20 +4,26 @@
 # Contributor: Tobias Powalowski <tpowa at archlinux.org>
 
 pkgbase=digikam
-pkgname=('digikam' 'kipi-plugins' 'libkvkontakte' 'libmediawiki')
-pkgver=4.9.0
-pkgrel=2
+pkgname=('digikam' 'kipi-plugins' 'libmediawiki')
+pkgver=4.11.0
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('kdepimlibs' 'libkexiv2' 'libkdcraw' 'libkipi' 'libksane' 'liblqr'
-             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'qjson' 'hugin' 'libgphoto2'
+             'kdeedu-marble' 'opencv' 'boost' 'libgpod' 'libkvkontakte' 'hugin' 'libgphoto2'
              'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt-gstreamer' 'imagemagick' 'eigen' 
 	     'libbaloo4' 'libpgf' 'libusb-compat' 'libkface' 'libkgeomap')
 source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d44ab133f152b84599507dd6a02aef4b22033dd4')
+sha1sums=('8fa6e277b775b615f10403b30a1b6d45c957ff3c')
 
+prepare() {
+# Remove internal FindLibKVkontakte.cmake
+  cd $pkgname-$pkgver
+  rm cmake/modules/FindLibKVkontakte.cmake
+}
+
 build() {
   mkdir build
   cd build
@@ -26,7 +32,6 @@
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DBUILD_tests=OFF \
-    -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=ON \
     -DDIGIKAMSC_COMPILE_LIBMEDIAWIKI=ON 
   make
 }
@@ -55,14 +60,6 @@
   rm "${pkgdir}"/usr/share/locale/kde4/*/LC_MESSAGES/libkipi.mo
 }
 
-package_libkvkontakte() {
-  pkgdesc="KDE C++ library for asynchronous interaction with vkontakte.rusocial network"
-  depends=('kdelibs' 'qjson')
-
-  cd build/extra/libkvkontakte
-  make DESTDIR="${pkgdir}" install
-}
-
 package_libmediawiki() {
   pkgdesc="A KDE C++ interface for MediaWiki based web service as wikipedia.org"
   depends=('kdelibs')