extra/digikam to 5.2.0-1

extra/digikam/0001-optionally-enable-OpenGL.patch

@@ -1,4 +1,4 @@
-From 72f50a2d29648248e03eb871f896f0c940e44c78 Mon Sep 17 00:00:00 2001
+From 9e291325f5d2568834fd0d590e5e99af129d9518 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Tue, 5 Jul 2016 18:47:56 -0600
 Subject: [PATCH] optionally enable OpenGL
@@ -9,18 +9,18 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 47f6b10..7615b7f 100644
+index d3e64b5..1dabead 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -104,6 +104,7 @@ option(ENABLE_KFILEMETADATASUPPORT  "Build digiKam with KDE files indexer suppor
- option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)"                       OFF)
- option(ENABLE_MEDIAPLAYER           "Build digiKam with QtMultimedia support (default=OFF)"                            OFF)
- option(ENABLE_DBUS                  "Build digiKam with DBUS support (default=ON)"                                     ON)
+ option(ENABLE_AKONADICONTACTSUPPORT "Build digiKam with KDE Mail Contacts support (default=OFF)"                         OFF)
+ option(ENABLE_MEDIAPLAYER           "Build digiKam with QtMultimedia support (default=OFF)"                              OFF)
+ option(ENABLE_DBUS                  "Build digiKam with DBUS support (default=ON)"                                       ON)
 +option(ENABLE_OPENGL                "Build digiKam with OpenGL support (default=ON)"                                   ON)
+ option(ENABLE_APPSTYLES             "Build digiKam with support for changing the widget application style (default=OFF)" OFF)
  
  # Mysql support options (experimental):
- option(ENABLE_MYSQLSUPPORT          "Build digiKam with MySQL dabatase support (default=OFF)"                          OFF)
-@@ -284,7 +285,7 @@ else()
+@@ -286,7 +287,7 @@ else()
  endif()
  
  # decide if Presentation tool can be built with OpenGL
@@ -30,5 +30,5 @@ index 47f6b10..7615b7f 100644
  elseif()
      set(HAVE_OPENGL FALSE)
 -- 
-2.8.3
+2.9.2
 

extra/digikam/PKGBUILD

@@ -9,36 +9,27 @@
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins')
-_pkgver=5.1.0
-pkgver=${_pkgver//-/_}
-pkgrel=4
+_pkgver=5.2.0
+pkgver=${_pkgver//-/_} # for beta versions
+pkgrel=1
 pkgdesc="Digital photo management application for KDE"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.digikam.org/"
 makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
-             'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
+             'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
              'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
-             'knotifyconfig' 'libmediawiki' 'libkvkontakte')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz" digikam-5.1-fix-build.patch
-        kdebug-367675.patch::"https://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=463667c8&o=plain"
+             'knotifyconfig' 'libmediawiki' 'libkvkontakte' 'gphoto2')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz"
         '0001-optionally-enable-OpenGL.patch')
-sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
-          '5b6644c8b5534a1712f46fc84948de9a0039a601'
-          'd669d6f248d6c7dec6728037992fdf8d4e14c1d9'
-          '2711c73bdecbf355d4b8be1fa0c46be2e0e22df8')
+sha1sums=('329195ac7ea890a3bec435cd2ed83b04bc80ba1d'
+          '95169d438884b1650a4c11e1ca44ae7ad5096a89')
 
 prepare() {
   mkdir -p build
 
-  cd $pkgname-$pkgver
-  # Fix build on i686
-  patch -p1 -i ../digikam-5.1-fix-build.patch
-  # Fix digikamhelperdir
-  cd core
-  patch -p1 -i "$srcdir"/kdebug-367675.patch
-
   # OpenGL switch
+  cd ${pkgname}-${_pkgver}/core
   patch -p1 -i ${srcdir}/0001-optionally-enable-OpenGL.patch
 }
 
@@ -49,13 +40,13 @@ build() {
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON \
     -DBUILD_TESTING=OFF \
     -DENABLE_KFILEMETADATASUPPORT=ON \
     -DENABLE_MEDIAPLAYER=ON \
     -DENABLE_AKONADICONTACTSUPPORT=ON \
     -DENABLE_MYSQLSUPPORT=ON \
     -DENABLE_OPENCV3=ON \
+    -DENABLE_APPSTYLES=ON \
     -DENABLE_OPENGL=OFF
   make
 }
@@ -65,13 +56,11 @@ package_digikam() {
   depends=('liblqr' 'libkipi' 'lensfun' 'opencv' 'akonadi-contacts'
 	'knotifyconfig' 'libksane' 'kfilemetadata' 'qt5-multimedia' 'marble' 'threadweaver' 'kcalcore')
   optdepends=('kipi-plugins: export to various online services'
-              'hugin: panorama tool')
+              'hugin: panorama tool' 'qt5-imageformats: WEBP format support')
 
   cd build/core
   make DESTDIR="$pkgdir" install
-  cd $srcdir/build/doc/digikam
-  make DESTDIR="$pkgdir" install
-  cd $srcdir/build/doc-translated/digikam
+  cd $srcdir/build/doc
   make DESTDIR="$pkgdir" install
   cd $srcdir/build/po
   make DESTDIR="$pkgdir" install
@@ -88,10 +77,6 @@ package_kipi-plugins() {
 
   cd build/extra
   make DESTDIR="$pkgdir" install
-  cd $srcdir/build/doc/kipi-plugins
-  make DESTDIR="$pkgdir" install
-  cd $srcdir/build/doc-translated/kipi-plugins
-  make DESTDIR="pkgdir" install
   cd $srcdir/build/po
   make DESTDIR="$pkgdir" install
 

extra/digikam/digikam-5.1-fix-build.patch

@@ -1,15 +0,0 @@
---- digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h.orig	2016-08-09 15:05:10.449224741 +0000
-+++ digikam-5.1.0/core/libs/rawengine/libraw/libraw/libraw_types.h	2016-08-09 15:05:50.725789944 +0000
-@@ -618,10 +618,10 @@
- #elif defined(_M_X64) || defined(__amd64__)
- #define LibRawBigEndian 0
- 
--#elif defined(__LITTLE_ENDIAN__)
-+#elif __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
- #define LibRawBigEndian 0
- 
--#elif defined(__BIG_ENDIAN__)
-+#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
- #define LibRawBigEndian 1
- #elif defined(_ARM_)
- #define LibRawBigEndian 0