KF5

2 files changed, 24 insertions, 44 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1cfd1f947db1..8456be8b9bb9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = kipi-plugins-git
 	pkgdesc = A collection of plugins extending the KDE graphics and image applications as digiKam
-	pkgver = r10108.cacd91b
+	pkgver = r11330.10738ee
 	pkgrel = 1
 	url = http://www.kipi-plugins.org/
 	install = kipi-plugins-git.install
@@ -10,31 +10,16 @@ pkgbase = kipi-plugins-git
 	license = LGPL
 	license = FDL
 	makedepends = git
-	makedepends = cmake
-	makedepends = automoc4
-	makedepends = pkgconfig
-	makedepends = opencv
-	makedepends = libgpod
-	makedepends = qjson
+	makedepends = extra-cmake-modules
+	makedepends = kcalcore
 	makedepends = libkgeomap-git
-	makedepends = libmediawiki-git
-	makedepends = libkvkontakte-git
-	makedepends = imagemagick
-	depends = kdebase-runtime
-	depends = kdepimlibs
 	depends = libkipi-git
 	depends = libkexiv2-git
 	depends = libkdcraw-git
 	depends = libksane-git
-	optdepends = imagemagick: for picture manipulation
 	optdepends = hugin: for expoblending plugin
-	optdepends = libgpod: send images to ipod
-	optdepends = opencv: red eye removal plugin
-	optdepends = qjson: for debianscreenshots plugin
+	optdepends = kcalcore: Calendar plugin
 	optdepends = libkgeomap-git: A tool to geolocalize pictures
-	optdepends = libmediawiki-git: A tool to export images to Mediawiki based web service
-	optdepends = libkvkontakte-git: A tool to export images to VKontakte web service
-	optdepends = imagemagick: For VideoSlideshow
 	provides = kipi-plugins
 	conflicts = kipi-plugins
 	source = kipi-plugins::git+git://anongit.kde.org/kipi-plugins
diff --git a/PKGBUILD b/PKGBUILD
index 164a2af35583..47bd48461c1f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,54 +2,49 @@
 # Based on kipi-plugins-svn PKGBUILD
 
 pkgname=kipi-plugins-git
-pkgver=r10108.cacd91b
+pkgver=r11330.10738ee
 pkgrel=1
 pkgdesc='A collection of plugins extending the KDE graphics and image applications as digiKam'
 license=('GPL' 'LGPL' 'FDL')
 arch=('i686' 'x86_64')
 url="http://www.kipi-plugins.org/"
-depends=( 'kdebase-runtime' 'kdepimlibs' 'libkipi-git' 'libkexiv2-git' 'libkdcraw-git' 'libksane-git')
-#depends=('kdelibs4support' 'libkipi-git' 'libkexiv2-git' 'libkdcraw-git' 'libksane-git' 'kparts')
-makedepends=('git' 'cmake' 'automoc4' 'pkgconfig' 'opencv' 'libgpod' 'qjson' 'libkgeomap-git' \
-	     'libmediawiki-git' 'libkvkontakte-git' 'imagemagick')
-optdepends=('imagemagick: for picture manipulation'
-            'hugin: for expoblending plugin'
-            'libgpod: send images to ipod'
-            'opencv: red eye removal plugin'
-            'qjson: for debianscreenshots plugin'
-	    'libkgeomap-git: A tool to geolocalize pictures'
-	    'libmediawiki-git: A tool to export images to Mediawiki based web service'
-	    'libkvkontakte-git: A tool to export images to VKontakte web service'
-	    'imagemagick: For VideoSlideshow')
+depends=('libkipi-git' 'libkexiv2-git' 'libkdcraw-git' 'libksane-git')
+makedepends=('git' 'extra-cmake-modules' 'kcalcore' 'libkgeomap-git')
+optdepends=('hugin: for expoblending plugin'
+	    'kcalcore: Calendar plugin'
+	    'libkgeomap-git: A tool to geolocalize pictures')
+#	    'libmediawiki-git: A tool to export images to Mediawiki based web service')
+#	    'libkvkontakte-git: A tool to export images to VKontakte web service')
 conflicts=('kipi-plugins')
 provides=('kipi-plugins')
 install=kipi-plugins-git.install
 source=('kipi-plugins::git+git://anongit.kde.org/kipi-plugins')
-#source=('kipi-plugins::git+git://anongit.kde.org/kipi-plugins#branch=frameworks')
 md5sums=('SKIP')
 
-
 pkgver() {
-  cd ${srcdir}/kipi-plugins
+  cd "${srcdir}/kipi-plugins"
   printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
-if [[ -d ${srcdir}/build ]]; then
+if [[ -d "${srcdir}/build" ]]; then
       msg "Cleaning the previous build directory..."
-      rm -rf ${srcdir}/build
+      rm -rf "${srcdir}/build"
   fi
-  mkdir ${srcdir}/build
+  mkdir "${srcdir}/build"
 }
 
 build() {
-  cd ${srcdir}/build
-  cmake  ${srcdir}/kipi-plugins -DCMAKE_BUILD_TYPE=Release \
-		-DCMAKE_INSTALL_PREFIX=/usr
+  cd "${srcdir}/build"
+  cmake "${srcdir}/kipi-plugins" -DCMAKE_BUILD_TYPE=Release \
+                -DCMAKE_INSTALL_PREFIX=/usr \
+                -DLIB_INSTALL_DIR=lib \
+                -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+                -DBUILD_TESTING=OFF
   make
 }
 
 package() {
-  cd ${srcdir}/build
-  make DESTDIR=${pkgdir} install
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
 }