From c979b8ae356cf35393dcb7d9e3ae6ad5a2c684d8 Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Fri, 11 Dec 2015 13:20:30 -0300 Subject: kipi-plugins-4.14.0-3.parabola1{,.nonprism1}: C++11 ABI rebuild * build with clang, fixes build with flex 2.6 --- nonprism/kipi-plugins/PKGBUILD | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'nonprism') diff --git a/nonprism/kipi-plugins/PKGBUILD b/nonprism/kipi-plugins/PKGBUILD index dca08fb93..ec11350f6 100644 --- a/nonprism/kipi-plugins/PKGBUILD +++ b/nonprism/kipi-plugins/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 250591 2015-11-10 21:55:23Z arojas $ +# $Id: PKGBUILD 253987 2015-12-08 18:07:26Z arojas $ # Maintainer (Arch): Ronald van Haren # Contributor (Arch): Andrea Scarpino # Contributor (Arch): Tobias Powalowski @@ -8,7 +8,7 @@ pkgbase=digikam pkgname=kipi-plugins pkgver=4.14.0 -pkgrel=2.parabola1.nonprism1 +pkgrel=3.parabola1.nonprism1 pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support and support for unsafe and dangerous for privacy protocols" arch=('i686' 'x86_64') license=('GPL') @@ -18,7 +18,7 @@ conflicts=("${pkgname}-libre" "${pkgname}-libre-nonprism") makedepends=('kdepimlibs4' 'libkexiv2_4' 'libkdcraw4' 'libkipi4' 'libksane4' 'liblqr' 'opencv' 'boost' 'libgpod' 'hugin' 'libgphoto2' 'cmake' 'automoc4' 'doxygen' 'lensfun' 'qt4-gstreamer' 'imagemagick' 'eigen' - 'libbaloo4' 'libpgf' 'libusb-compat' 'libkface4' 'libkgeomap4' 'libmediawiki') + 'libbaloo4' 'libpgf' 'libusb-compat' 'libkface4' 'libkgeomap4' 'libmediawiki' 'clang') depends=('kdebase-runtime' 'kdepimlibs4' 'libkdcraw4' 'libkipi4' 'libksane4' 'libkexiv2_4') optdepends=('libkgeomap4: Geolocalize tool' 'libmediawiki: MediaWiki Export plugin' @@ -34,6 +34,11 @@ sha1sums=('08bbded5433e442dce8ac00eb301606ef0924e8c') prepare() { cd ${srcdir}/${pkgbase}-${pkgver} + +# Fix compilation with clang + sed -i '\|fno-tree-pre|d + ' core/CMakeLists.txt + sed -i '\|flashexport|d \|jalbumexport|d \|imageshackexport|d @@ -69,7 +74,8 @@ build() { -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=ON \ -DBUILD_tests=OFF \ - -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF + -DDIGIKAMSC_COMPILE_LIBKVKONTAKTE=OFF \ + -DCMAKE_C_COMPILER=clang # Fix build with flex 2.6 make } -- cgit v1.2.3