summaryrefslogtreecommitdiff
path: root/libre
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-12-11 13:20:30 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2015-12-11 13:20:30 -0300
commitc979b8ae356cf35393dcb7d9e3ae6ad5a2c684d8 (patch)
treed7faa43766ac21214b692723ab1da11b7f00af96 /libre
parent1b988318672c72891f25239e924ab843132fa7a8 (diff)
downloadabslibre-c979b8ae356cf35393dcb7d9e3ae6ad5a2c684d8.tar.gz
abslibre-c979b8ae356cf35393dcb7d9e3ae6ad5a2c684d8.tar.bz2
abslibre-c979b8ae356cf35393dcb7d9e3ae6ad5a2c684d8.zip
kipi-plugins-4.14.0-3.parabola1{,.nonprism1}: C++11 ABI rebuild
* build with clang, fixes build with flex 2.6
Diffstat (limited to 'libre')
-rw-r--r--libre/kipi-plugins/PKGBUILD14
1 files changed, 10 insertions, 4 deletions
diff --git a/libre/kipi-plugins/PKGBUILD b/libre/kipi-plugins/PKGBUILD
index 3decd0f80..e57aafd64 100644
--- a/libre/kipi-plugins/PKGBUILD
+++ b/libre/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 <ronald@archlinux.org>
# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
# Contributor (Arch): Tobias Powalowski <tpowa@archlinux.org>
@@ -8,7 +8,7 @@
pkgbase=digikam
pkgname=kipi-plugins
pkgver=4.14.0
-pkgrel=2.parabola1
+pkgrel=3.parabola1
pkgdesc="A collection of plugins extending the KDE graphics and image applications as digiKam, without nonfree jAlbum and SimpleViewer support"
arch=('i686' 'x86_64')
license=('GPL')
@@ -18,7 +18,7 @@ conflicts=("${pkgname}-libre")
makedepends=('kdepimlibs4' 'libkexiv2_4' 'libkdcraw4' 'libkipi4' 'libksane4' 'liblqr'
'opencv' 'boost' 'libgpod' 'libkvkontakte' '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'
@@ -35,6 +35,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
' extra/kipi-plugins/CMakeLists.txt
@@ -47,7 +52,8 @@ build() {
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_SKIP_RPATH=ON \
- -DBUILD_tests=OFF
+ -DBUILD_tests=OFF \
+ -DCMAKE_C_COMPILER=clang # Fix build with flex 2.6
make
}