libre/digikam: (kipi-plugins) updated to 5.7.0

1 files changed, 31 insertions, 25 deletions

diff --git a/libre/digikam/PKGBUILD b/libre/digikam/PKGBUILD
index f1945a1de..3f5f1dfa8 100644
--- a/libre/digikam/PKGBUILD
+++ b/libre/digikam/PKGBUILD
@@ -1,46 +1,52 @@
-# $Id: PKGBUILD 290817 2017-03-14 08:05:30Z arojas $
+# Maintainer: Andreas Grapentin <andreas@grapentin.org>
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer: André Silva <emulatorman@hyperbola.info>
+# Contributor: André Silva <emulatorman@hyperbola.info>
 # Contributor: Márcio Silva <coadde@hyperbola.info>
 # Contributor: jc_gargma <jc_gargma@iserlohn-fortress.net>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
 
-pkgbase=digikam
+_pkgbase=digikam
 pkgname=kipi-plugins
-_pkgver=5.6.0
+
+_pkgver=5.7.0
 pkgver=${_pkgver//-/_} # for beta versions
-pkgrel=2.parabola1
+arch=(i686 x86_64 armv7h)
+pkgrel=1.parabola1
+
 pkgdesc="Digital photo management application for KDE"
-arch=('i686' 'x86_64' 'armv7h')
-license=('GPL')
 url="http://www.digikam.org/"
-replaces=("${pkgname}-libre")
-conflicts=("${pkgname}-libre")
-makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
-             'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble-common' 'kdesignerplugin'
-             'kfilemetadata' 'akonadi-contacts' 'qtav' 'threadweaver' 'kcalcore'
-             'knotifyconfig' 'libmediawiki' 'libkvkontakte')
-source=("https://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
+license=(GPL)
+
+makedepends=(extra-cmake-modules libkipi libksane liblqr opencv boost
+             doxygen lensfun eigen kdoctools marble-common kdesignerplugin
+             kfilemetadata akonadi-contacts qtav threadweaver kcalcore
+             knotifyconfig libmediawiki libkvkontakte)
+source=("https://download.kde.org/stable/$_pkgbase/$_pkgbase-$_pkgver.tar.xz"
         "libre.patch"
         '0001-optionally-enable-OpenGL.patch')
-sha512sums=('015024aaff6193ca29072f7340d62982b50467d84b69bac38f60319eaf771ce2a570a514e62fefc54f194b0c27df0c36980b1eed3433023a2d8290f24cc8905d'
-            '403da9ea61560a7e03f519f7da0373439da162ba73d1e5c90e4e1f65146faf216644d1aa04c88519fae78767154cac720be5281ef2d9ead9b920d1e0c5e00921'
-            '8a5f06f916465ffa59712a49ac2dc3482093ceae1d77250ae66a5f1a469387b4052840c5fe569afe809fcd2f01eda863e4acecf2104a11c11874c28d82c34113')
+sha256sums=('3605ffb5b6e8fbd6b725e5075f74f505d7edee7531789c2882d11df2d20150f5'
+            '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89'
+            'f6f234f430f02e058e12e48577f9d8441959e84b42f4e50d733706be8b214bf5')
+replaces=("$pkgname-libre")
+conflicts=("$pkgname-libre")
 
 prepare() {
   mkdir -p build
+  cd $_pkgbase-$_pkgver
 
   # sv docs fail to build
-  sed -e '/sv/d' -i $pkgbase-$pkgver/doc-translated/CMakeLists.txt
+  sed -e '/sv/d' -i doc-translated/CMakeLists.txt
+
+  # fix conflicts with libkvkontakte
+  rm po/*/libkvkontakte.po
 
-  cd ${pkgbase}-${_pkgver}
   patch -p1 -i ../libre.patch
 
   # OpenGL switch
   if [[ "$CARCH" = arm* ]]; then
     cd core
-    patch -p1 -i ${srcdir}/0001-optionally-enable-OpenGL.patch
+    patch -p1 -i $srcdir/0001-optionally-enable-OpenGL.patch
   fi
 }
 
@@ -51,7 +57,7 @@ build() {
     local cmake_extra="-DENABLE_OPENGL=OFF"
   fi
 
-  cmake ../${pkgbase}-${_pkgver} \
+  cmake ../$_pkgbase-$_pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release \
@@ -68,7 +74,7 @@ build() {
 
 package_kipi-plugins() {
   pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree suggestions"
-  depends=('kio' 'libkipi')
+  depends=(kio libkipi)
   optdepends=('libmediawiki: MediaWiki Export plugin'
               'libkvkontakte: VKontakte.ru Exporter plugin')
 
@@ -77,6 +83,6 @@ package_kipi-plugins() {
   cd $srcdir/build/po
   make DESTDIR="$pkgdir" install
 
-# Provided by digikam
+  # Provided by digikam
   rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/digikam.mo
 }