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

[Antonio Rojas]

    Date: Tuesday, August 9, 2016 @ 17:43:27
  Author: arojas
Revision: 273539

Update to 5.1.0

Added:
  digikam/kde-unstable/digikam-5.1-fix-build.patch
Modified:
  digikam/kde-unstable/PKGBUILD

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

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-09 16:39:07 UTC (rev 273538)
+++ PKGBUILD	2016-08-09 17:43:27 UTC (rev 273539)
@@ -5,25 +5,27 @@
 
 pkgbase=digikam
 pkgname=('digikam' 'kipi-plugins')
-_pkgver=5.0.0
+_pkgver=5.1.0
 pkgver=${_pkgver//-/_}
-pkgrel=2
+pkgrel=3
 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'
-             'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
+             'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
              'kfilemetadata' 'akonadi-contacts' 'qt5-multimedia' 'threadweaver' 'kcalcore'
-             'knotifyconfig' 'libmediawiki' 'libkvkontakte' 'kqoauth')
-source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz")
-sha1sums=('e0dec2eba9ab3a51d632b69b3dd6daf8dca64a45')
+             'knotifyconfig' 'libmediawiki' 'libkvkontakte')
+source=("http://download.kde.org/stable/${pkgname}/${pkgname}-${_pkgver}.tar.xz" digikam-5.1-fix-build.patch)
+sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680'
+          '5b6644c8b5534a1712f46fc84948de9a0039a601')
 
 prepare() {
   mkdir -p build
 
-# Build fails
-  sed -e '/add_subdirectory(showfoto)/d' -i $pkgname-${_pkgver}/doc-translated/digikam/CMakeLists.txt
+  cd $pkgname-$pkgver
+  # Fix build on i686
+  patch -p1 -i ../digikam-5.1-fix-build.patch
 }
 
 build() {
@@ -67,8 +69,7 @@
   pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam"
   depends=('kio' 'libkipi')
   optdepends=('libmediawiki: MediaWiki Export plugin'
-              'libkvkontakte: VKontakte.ru Exporter plugin'
-              'kqoauth: OAuth authentication for imgur')
+              'libkvkontakte: VKontakte.ru Exporter plugin')
 
   cd build/extra
   make DESTDIR="$pkgdir" install

Added: digikam-5.1-fix-build.patch
===================================================================
--- digikam-5.1-fix-build.patch	                        (rev 0)
+++ digikam-5.1-fix-build.patch	2016-08-09 17:43:27 UTC (rev 273539)
@@ -0,0 +1,15 @@
+--- 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