[arch-commits] Commit in digikam/trunk (PKGBUILD digikam-5.1-fix-build.patch)
Antonio Rojas
arojas at archlinux.org
Tue Aug 9 16:38:34 UTC 2016
Date: Tuesday, August 9, 2016 @ 16:38:33
Author: arojas
Revision: 273537
Update to 5.1.0
Added:
digikam/trunk/digikam-5.1-fix-build.patch
Modified:
digikam/trunk/PKGBUILD
-----------------------------+
PKGBUILD | 17 +++++++++--------
digikam-5.1-fix-build.patch | 15 +++++++++++++++
2 files changed, 24 insertions(+), 8 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-08-09 09:19:24 UTC (rev 273536)
+++ PKGBUILD 2016-08-09 16:38:33 UTC (rev 273537)
@@ -5,7 +5,7 @@
pkgbase=digikam
pkgname=('digikam' 'kipi-plugins')
-_pkgver=5.0.0
+_pkgver=5.1.0
pkgver=${_pkgver//-/_}
pkgrel=1
pkgdesc="Digital photo management application for KDE"
@@ -15,15 +15,17 @@
makedepends=('extra-cmake-modules' 'libkipi' 'libksane' 'liblqr' 'opencv' 'boost'
'opencv' 'doxygen' 'lensfun' 'eigen' 'kdoctools' 'marble' 'kdesignerplugin'
'kfilemetadata' 'akonadi-contact' '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 16:38:33 UTC (rev 273537)
@@ -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
More information about the arch-commits
mailing list