diff options
Diffstat (limited to 'libre')
| -rw-r--r-- | libre/kipi-plugins/PKGBUILD | 19 | ||||
| -rw-r--r-- | libre/kipi-plugins/digikam-5.1-fix-build.patch | 15 |
2 files changed, 25 insertions, 9 deletions
diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD index c78e37762..b79dbedbc 100644 --- a/libre/kipi-plugins/PKGBUILD +++ b/libre/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 271080 2016-07-06 10:08:49Z arojas $ +# $Id: PKGBUILD 273537 2016-08-09 16:38:33Z arojas $ # Maintainer (Arch): Ronald van Haren <ronald@archlinux.org> # Contributor (Arch): Andrea Scarpino <andrea@archlinux.org> # Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org> @@ -7,7 +7,7 @@ pkgbase=digikam pkgname=kipi-plugins -_pkgver=5.0.0 +_pkgver=5.1.0 pkgver=${_pkgver//-/_} pkgrel=1.parabola1 pkgdesc="Digital photo management application for KDE" @@ -19,20 +19,22 @@ conflicts=("${pkgname}-libre") 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') + 'knotifyconfig' 'libmediawiki' 'libkvkontakte') source=("http://download.kde.org/stable/${pkgbase}/${pkgbase}-${_pkgver}.tar.xz" + "digikam-5.1-fix-build.patch" "libre.patch") -sha1sums=('e0dec2eba9ab3a51d632b69b3dd6daf8dca64a45' +sha1sums=('87a843c39f45b8704ead6e6029e52fb03ee44680' + '5b6644c8b5534a1712f46fc84948de9a0039a601' 'ed2a01c4a837b50d3c1ad0d4758f2fa3bb44402f') prepare() { mkdir -p build -# Build fails - sed -e '/add_subdirectory(showfoto)/d' -i ${pkgbase}-${_pkgver}/doc-translated/digikam/CMakeLists.txt - cd ${pkgbase}-${_pkgver} patch -p1 -i ../libre.patch + + # Fix build on i686 + patch -p1 -i ../digikam-5.1-fix-build.patch } build() { @@ -56,8 +58,7 @@ package_kipi-plugins() { pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree suggestions" 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 diff --git a/libre/kipi-plugins/digikam-5.1-fix-build.patch b/libre/kipi-plugins/digikam-5.1-fix-build.patch new file mode 100644 index 000000000..29f282079 --- /dev/null +++ b/libre/kipi-plugins/digikam-5.1-fix-build.patch @@ -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 |