[arch-commits] Commit in digikam/trunk (PKGBUILD digikam-5.1-fix-build.patch)

[Antonio Rojas]

    Date: Friday, September 23, 2016 @ 11:17:29
  Author: arojas
Revision: 276865

Update to 5.2.0

Modified:
  digikam/trunk/PKGBUILD
Deleted:
  digikam/trunk/digikam-5.1-fix-build.patch

-----------------------------+
 PKGBUILD                    |   36 ++++++++++--------------------------
 digikam-5.1-fix-build.patch |   15 ---------------
 2 files changed, 10 insertions(+), 41 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-09-23 08:05:34 UTC (rev 276864)
+++ PKGBUILD	2016-09-23 11:17:29 UTC (rev 276865)
@@ -5,9 +5,9 @@
 
 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')
@@ -15,22 +15,12 @@
 makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
              '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")
-sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
-          '5b6644c8b5534a1712f46fc84948de9a0039a601'
-          'd669d6f248d6c7dec6728037992fdf8d4e14c1d9')
+             'knotifyconfig' 'libmediawiki' 'libkvkontakte' 'gphoto2')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
+sha1sums=('329195ac7ea890a3bec435cd2ed83b04bc80ba1d')
 
 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
 }
 
 build() {
@@ -40,13 +30,13 @@
     -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_OPENCV3=ON \
+    -DENABLE_APPSTYLES=ON
   make
 }
 
@@ -55,14 +45,12 @@
   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
+  cd $srcdir/build/doc
   make DESTDIR="$pkgdir" install
-  cd $srcdir/build/doc-translated/digikam
-  make DESTDIR="$pkgdir" install
   cd $srcdir/build/po
   make DESTDIR="$pkgdir" install
 
@@ -78,10 +66,6 @@
 
   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
 

Deleted: digikam-5.1-fix-build.patch
===================================================================
--- digikam-5.1-fix-build.patch	2016-09-23 08:05:34 UTC (rev 276864)
+++ digikam-5.1-fix-build.patch	2016-09-23 11:17:29 UTC (rev 276865)
@@ -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