PKGBUILD fixes and update to version 6.4.0

1 files changed, 22 insertions, 18 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 916bbaa9b64a..415c3aba0bc6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,48 @@
-# Maintainer: Luca P <meti at lplab.net>
+# Maintainer: AudioLinux  <audiolinux AT fastmail DOT fm>
+
+# Contributor: Luca P <meti at lplab.net>
 # Contributor: Taijian <taijian@posteo.de>
 # Contributor: Andy Kluger <andykluger@gmail.com>
 # Contributor: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
+
 _pkgname=digikam
 pkgname=digikam-without-akonadi-mediawiki-vkontakte
-pkgver=6.3.0
+pkgver=6.4.0
 pkgrel=1
 pkgdesc="minimized build of Digikam for non-KDE users, without Plasma/KDE integration"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.digikam.org/"
 depends=(liblqr libkipi libksane lensfun opencv knotifyconfig marble-common
-	threadweaver kcalcore exiv2 imagemagick)
+	threadweaver kcalendarcore exiv2 imagemagick)
 optdepends=('kipi-plugins: export to various online services'
             'hugin: panorama tool')
 makedepends=(extra-cmake-modules boost doxygen eigen kdoctools glu)
 conflicts=('digikam' 'digikam-git')
 provides=('digikam')
-source=("http://download.kde.org/stable/${_pkgname}/${pkgver}/${_pkgname}-${pkgver}.tar.xz")
-sha256sums=('94dc05e3f9c08b83419010d1689c7b0398d4eced4fef42375249c974622874ba')
+source=("https://download.kde.org/stable/$_pkgname/$pkgver/$_pkgname-$pkgver.tar.xz"{,.sig}
+         initialize-imagemagick.patch::"https://cgit.kde.org/digikam.git/patch/?id=76ff65ae"
+         digikam-opencv-4.2.patch
+         digikam-qt-5.15.patch)
+sha256sums=('775012ff515bdd25a0b894c95bf5d33e7122b523da9c0f3af260ec3eff498d6f'
+            'SKIP'
+            'c559882c0df2243c5a5baab3373bda4084fb9a1d54959770b8846fe026eaf360'
+            '41e687eacf59f7a92deae535a097e456dcb4243686286aad16329acef71c7594'
+            '3dd295fe3b49bf2140e44a86e65741522744034e0d204af12a642621feea81fc')
 
-prepare() {
-  cd "${_pkgname}-${pkgver}"
+  prepare() {
+  mkdir -p build
+  cd $_pkgname-$pkgver
+  patch -p1 -i ../initialize-imagemagick.patch # Properly initialize exceptions in imagemagick
+  patch -p1 -i ../digikam-opencv-4.2.patch # Fix build with opencv 4.2
+  patch -p1 -i ../digikam-qt-5.15.patch # Fix build with qt 5.15
 }
 
 build() {
   cd "${_pkgname}-${pkgver}"
-
-  cmake "${srcdir}/${_pkgname}-${pkgver}" \
+  cmake ../$_pkgname-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release \
@@ -50,15 +63,6 @@ build() {
 }
 
 package() {
-  #cd "${_pkgname}-${pkgver}/core"
-  #make DESTDIR="$pkgdir" install
-  #cd "${srcdir}/${_pkgname}-${pkgver}/doc"
-  #make DESTDIR="$pkgdir" install
-  #cd "${srcdir}/${_pkgname}-${pkgver}/po"
-  #make DESTDIR="$pkgdir" install
-
-  # Provided by kipi-plugins
-  #rm "$pkgdir"/usr/share/locale/*/LC_MESSAGES/kipiplugin*.mo
   cd "${_pkgname}-${pkgver}"
   make DESTDIR="$pkgdir" install
 }