libre/digikam: brought closer to upstream, hopefully fixing arm build

1 files changed, 38 insertions, 45 deletions

diff --git a/libre/digikam/PKGBUILD b/libre/digikam/PKGBUILD
index 3f5f1dfa8..dc77393e1 100644
--- a/libre/digikam/PKGBUILD
+++ b/libre/digikam/PKGBUILD
@@ -1,63 +1,57 @@
-# Maintainer: Andreas Grapentin <andreas@grapentin.org>
+# $Id$
 # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org>
+# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
+# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
 # 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
-pkgname=kipi-plugins
 
+pkgbase=digikam
+pkgname=(kipi-plugins)
 _pkgver=5.7.0
 pkgver=${_pkgver//-/_} # for beta versions
-arch=(i686 x86_64 armv7h)
-pkgrel=1.parabola1
-
-pkgdesc="Digital photo management application for KDE"
+pkgrel=5.parabola1
+pkgdesc="An advanced digital photo management application"
+arch=('x86_64' 'i686' 'armv7h')
+license=('GPL')
 url="http://www.digikam.org/"
-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')
+makedepends=(extra-cmake-modules libkipi libksane liblqr opencv doxygen lensfun eigen boost kdoctools marble-common
+             kfilemetadata akonadi-contacts qtav threadweaver kcalcore knotifyconfig libmediawiki libkvkontakte)
+source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz"
+        digikam-kcalcore-17.12.patch
+        digikam-qt-5.9.3.patch::"https://cgit.kde.org/digikam.git/patch/?id=855ba5b7"
+        digikam-opencv-3.4.patch
+        libre.patch)
 sha256sums=('3605ffb5b6e8fbd6b725e5075f74f505d7edee7531789c2882d11df2d20150f5'
-            '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89'
-            'f6f234f430f02e058e12e48577f9d8441959e84b42f4e50d733706be8b214bf5')
-replaces=("$pkgname-libre")
-conflicts=("$pkgname-libre")
+            '61648bdeb88dcb94d2896b9d9211c6a6b50a39a143701e04465aa040a60053c0'
+            '03822e596321028d0971ec82351337dad76abeda93c9cef3b1d2a31807e02661'
+            'b822cf879216a479134e48e3cfb597ef5b741698454e0993846ab660896caba7'
+            '80fbe434d326551f3dc029c5db3ad1b50e87870b03185467aa25a5c03764cc89')
 
 prepare() {
   mkdir -p build
-  cd $_pkgbase-$_pkgver
-
-  # sv docs fail to build
-  sed -e '/sv/d' -i doc-translated/CMakeLists.txt
-
-  # fix conflicts with libkvkontakte
-  rm po/*/libkvkontakte.po
 
-  patch -p1 -i ../libre.patch
-
-  # OpenGL switch
-  if [[ "$CARCH" = arm* ]]; then
-    cd core
-    patch -p1 -i $srcdir/0001-optionally-enable-OpenGL.patch
-  fi
+# sv docs fail to build
+  sed -e '/sv/d' -i $pkgbase-$pkgver/doc-translated/CMakeLists.txt
+# fix conflicts with libkvkontakte
+  rm $pkgbase-$pkgver/po/*/libkvkontakte.po
+# fix freedom issues
+  cd $pkgbase-$_pkgver
+  patch -p1 -i "$srcdir"/libre.patch
+# fix build with kcalcore 17.12
+  cd core
+  patch -p1 -i "$srcdir"/digikam-kcalcore-17.12.patch
+# fix thumbnails with Qt 5.9.3
+  patch -p1 -i "$srcdir"/digikam-qt-5.9.3.patch
+# fix build with opencv 3.4
+  patch -p1 -i "$srcdir"/digikam-opencv-3.4.patch
 }
 
 build() {
   cd build
 
-  if [[ "$CARCH" = arm* ]]; then
-    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 \
@@ -67,8 +61,7 @@ build() {
     -DENABLE_AKONADICONTACTSUPPORT=ON \
     -DENABLE_MYSQLSUPPORT=ON \
     -DENABLE_OPENCV3=ON \
-    -DENABLE_APPSTYLES=ON \
-    $cmake_extra
+    -DENABLE_APPSTYLES=ON
   make
 }
 
@@ -83,6 +76,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
 }