From bcbebf33abec328c1065cf773031aadd6b343b91 Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Date: Tue, 15 Dec 2015 09:12:34 +0700
Subject: graphics/digikam: Patched to build against newer lensfun and flex

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 graphics/digikam/digikam.SlackBuild  | 11 ++++++++++-
 graphics/digikam/lensfun-0.3.2.patch | 26 ++++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 graphics/digikam/lensfun-0.3.2.patch

(limited to 'graphics/digikam')

diff --git a/graphics/digikam/digikam.SlackBuild b/graphics/digikam/digikam.SlackBuild
index fc091e3977..9674fcfaa3 100644
--- a/graphics/digikam/digikam.SlackBuild
+++ b/graphics/digikam/digikam.SlackBuild
@@ -25,7 +25,7 @@
 
 PRGNAM=digikam
 VERSION=${VERSION:-4.14.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
@@ -66,6 +66,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
+cd core
+# patch for lensfun 0.3.2
+patch -p1 < $CWD/lensfun-0.3.2.patch
+
+# workaround for flex-2.6.0
+sed -e '/fno-tree-pre/d' -i CMakeLists.txt
+cd ..
+
 mkdir -p build
 cd build
   cmake \
@@ -83,6 +91,7 @@ cd build
     -DDIGIKAMSC_COMPILE_DOC=OFF \
     -DCMAKE_CXX_FLAGS:STRING="$(/usr/bin/Magick++-config --libs)" \
     -DENABLE_OPENCV3=ON \
+    -DCMAKE_C_COMPILER=clang \
     -DCMAKE_BUILD_TYPE=Release ..
   make
   make install DESTDIR=$PKG
diff --git a/graphics/digikam/lensfun-0.3.2.patch b/graphics/digikam/lensfun-0.3.2.patch
new file mode 100644
index 0000000000..37776f6e31
--- /dev/null
+++ b/graphics/digikam/lensfun-0.3.2.patch
@@ -0,0 +1,26 @@
+From: Gilles Caulier <caulier.gilles@gmail.com>
+Date: Mon, 14 Dec 2015 21:41:55 +0000
+Subject: fix compilation with Lensfun 0.3.2
+X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=0f159981176faa6da701f112bfe557b79804d468
+---
+fix compilation with Lensfun 0.3.2
+It still compatible with older lensfun releases.
+BUGS: 356672
+FIXED-IN: 5.0.0
+---
+
+
+--- a/libs/dimg/filters/lens/lensfuniface.h
++++ b/libs/dimg/filters/lens/lensfuniface.h
+@@ -24,10 +24,7 @@
+ 
+ // Lib LensFun includes
+ 
+-extern "C"
+-{
+ #include <lensfun.h>
+-}
+ 
+ // Local includes
+ 
+
-- 
cgit v1.2.3