[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2020-06-30 Thread Andreas Sturmlechner
commit: 54c96702dba9bb8dc9fccd90ee19439ecc6a237e
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Jun 30 21:20:54 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Jun 30 21:44:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54c96702

media-gfx/digikam: Fix 6.4.0-r1 build w/ Qt-5.15

Thanks-to: Thomas Posch  online.posch.name>
Closes: https://bugs.gentoo.org/729446
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/digikam/digikam-6.4.0-r1.ebuild  |  5 ++-
 .../digikam/files/digikam-6.4.0-qt-5.15.patch  | 38 ++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/media-gfx/digikam/digikam-6.4.0-r1.ebuild 
b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
index f89120250bc..870d93f3a99 100644
--- a/media-gfx/digikam/digikam-6.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-6.4.0-r1.ebuild
@@ -109,7 +109,10 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # bug 366505
 
-PATCHES=( "${FILESDIR}/${PN}-6.3.0-cmake.patch" )
+PATCHES=(
+   "${FILESDIR}/${PN}-6.3.0-cmake.patch"
+   "${FILESDIR}/${P}-qt-5.15.patch" # bug 730298
+)
 
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

diff --git a/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch 
b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
new file mode 100644
index 000..c2d5154b549
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.4.0-qt-5.15.patch
@@ -0,0 +1,38 @@
+Fix build with Qt 5.15
+
+Authored-by: Thomas Posch 
+
+diff -Naur a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp 
b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
+--- a/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
2020-06-30 22:48:50.477149053 +0200
 b/core/dplugins/generic/view/presentation/opengl/presentationgl.cpp
2020-06-30 22:49:52.217439213 +0200
+@@ -44,6 +44,8 @@
+ #include 
+ #include 
+ #include 
++#include 
++#include 
+ #include 
+ #include 
+ #include 
+diff -Naur a/core/libs/dimg/filters/curves/curveswidget.cpp 
b/core/libs/dimg/filters/curves/curveswidget.cpp
+--- a/core/libs/dimg/filters/curves/curveswidget.cpp   2020-06-30 
22:48:50.374150231 +0200
 b/core/libs/dimg/filters/curves/curveswidget.cpp   2020-06-30 
22:49:17.219842551 +0200
+@@ -41,6 +41,7 @@
+ #include 
+ #include 
+ #include 
++#include 
+ #include 
+ 
+ // KDE includes
+diff -Naur a/core/libs/dimg/filters/levels/histogrampainter.cpp 
b/core/libs/dimg/filters/levels/histogrampainter.cpp
+--- a/core/libs/dimg/filters/levels/histogrampainter.cpp   2020-06-30 
22:48:50.374150231 +0200
 b/core/libs/dimg/filters/levels/histogrampainter.cpp   2020-06-30 
22:49:17.219842551 +0200
+@@ -30,6 +30,7 @@
+ // Qt includes
+ 
+ #include 
++#include 
+ 
+ // KDE includes
+ 



[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2019-08-22 Thread Andreas Sturmlechner
commit: 95c14433ba569fcc4dba0279e7a1e71b8eff676c
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Aug 22 12:46:04 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Aug 22 14:15:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95c14433

media-gfx/digikam: Fix build with ImageMagick-7.0.8.60

Thanks-to: David Haller  dhaller.de>
Closes: https://bugs.gentoo.org/692326
Package-Manager: Portage-2.3.72, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/digikam/digikam-6.2.0.ebuild |  1 +
 .../digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch | 14 ++
 2 files changed, 15 insertions(+)

diff --git a/media-gfx/digikam/digikam-6.2.0.ebuild 
b/media-gfx/digikam/digikam-6.2.0.ebuild
index 4478b85ae23..d28773546dc 100644
--- a/media-gfx/digikam/digikam-6.2.0.ebuild
+++ b/media-gfx/digikam/digikam-6.2.0.ebuild
@@ -109,6 +109,7 @@ RESTRICT+=" test"
 PATCHES=(
"${FILESDIR}/${P}-googlephoto-upload.patch"
"${FILESDIR}/${P}-cmake.patch"
+   "${FILESDIR}/${P}-imagemagick-7.0.8.60.patch"
 )
 
 pkg_pretend() {

diff --git a/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch 
b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
new file mode 100644
index 000..264da2c34f2
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.2.0-imagemagick-7.0.8.60.patch
@@ -0,0 +1,14 @@
+--- a/core/tests/dimg/magickloader.cpp 
 a/core/tests/dimg/magickloader.cpp 
+@@ -139,7 +139,11 @@ int main(int argc, char** argv)
+ if (inf->encoder) mode.append(QLatin1Char('W'));
+ else  mode.append(QLatin1Char('-'));
+ 
++#if( (MagickLibVersion >= 0x708) && defined(magick_module) ) /* defined since 
7.0.8.60 */
++QString module = QLatin1String(inf->magick_module);
++#else
+ QString module = QLatin1String(inf->module);
++#endif
+ QString mime   = 
QMimeDatabase().mimeTypeForFile(QFileInfo(QString::fromLatin1("foo.%1").arg(module))).name();
+ 
+ if (module != QLatin1String("DNG")  &&
\ No newline at end of file



[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2019-02-17 Thread Andreas Sturmlechner
commit: f0e4482c6d36030e7cc3146d4de54b78ba047453
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 17 22:54:19 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 17 22:59:28 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f0e4482c

media-gfx/digikam: Un-break optional Qt5 detection

Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-gfx/digikam/digikam-6.0.0.ebuild|  2 +
 media-gfx/digikam/files/digikam-6.0.0-cmake.patch | 62 +++
 2 files changed, 64 insertions(+)

diff --git a/media-gfx/digikam/digikam-6.0.0.ebuild 
b/media-gfx/digikam/digikam-6.0.0.ebuild
index 4288c82dc56..0c70439cb3f 100644
--- a/media-gfx/digikam/digikam-6.0.0.ebuild
+++ b/media-gfx/digikam/digikam-6.0.0.ebuild
@@ -105,6 +105,8 @@ RDEPEND="${COMMON_DEPEND}
 RESTRICT+=" test"
 # bug 366505
 
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
+
 pkg_pretend() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
kde5_pkg_pretend

diff --git a/media-gfx/digikam/files/digikam-6.0.0-cmake.patch 
b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
new file mode 100644
index 000..f90067f4812
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-6.0.0-cmake.patch
@@ -0,0 +1,62 @@
+From 0d24a8971700454533c66ab9fc63043c67d44da6 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Sun, 17 Feb 2019 23:51:03 +0100
+Subject: [PATCH] Un-break optional Qt5 detection
+
+---
+ core/CMakeLists.txt | 22 ++
+ 1 file changed, 10 insertions(+), 12 deletions(-)
+
+diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
+index 27d3819323..17c8aa0320 100644
+--- a/core/CMakeLists.txt
 b/core/CMakeLists.txt
+@@ -134,16 +134,14 @@ find_package(Qt5 ${QT_MIN_VERSION}
+ )
+ 
+ if(ENABLE_QWEBENGINE)
+-find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebEngineWidgets)
++find_package(Qt5WebEngineWidgets ${QT_MIN_VERSION} NO_MODULE)
+ else()
+-find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS WebKitWidgets)
++find_package(Qt5WebKitWidgets ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+ 
+-find_package(Qt5 ${QT_MIN_VERSION}
+- OPTIONAL_COMPONENTS
+- DBus
+- OpenGL
+-)
++find_package(Qt5DBus ${QT_MIN_VERSION})
++
++find_package(Qt5OpenGL ${QT_MIN_VERSION})
+ 
+ if(ENABLE_DBUS)
+ if(NOT Qt5DBus_FOUND)
+@@ -154,10 +152,10 @@ endif()
+ # Dependencies For unit tests and CLI test tools
+ 
+ if(BUILD_TESTING)
+-find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS
+- Test
+- Qml WebView  # Optional, for 'sialis' O2 library test tool.
+-)
++find_package(Qt5Test ${QT_MIN_VERSION} NO_MODULE)
++# Optional, for 'sialis' O2 library test tool.
++find_package(Qt5Qml ${QT_MIN_VERSION} NO_MODULE)
++find_package(Qt5WebView ${QT_MIN_VERSION} NO_MODULE)
+ endif()
+ 
+ find_package(KF5 ${KF5_MIN_VERSION}
+@@ -323,7 +321,7 @@ find_package(OpenGL)   # For 
Presentation tool.
+ find_package(X11)
+ 
+ if(X11_FOUND)
+-find_package(Qt5 ${QT_MIN_VERSION} NO_MODULE COMPONENTS X11Extras)
++find_package(Qt5X11Extras ${QT_MIN_VERSION} NO_MODULE)
+ set(HAVE_X11 TRUE)
+ else()
+ set(HAVE_X11 FALSE)
+-- 
+2.20.1
+



[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2018-05-02 Thread Johannes Huber
commit: 19b939a52a4462ec8e7e7650e341ef83d0ea1a16
Author: Johannes Huber  gentoo  org>
AuthorDate: Wed May  2 19:10:22 2018 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Wed May  2 19:12:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=19b939a5

media-gfx/digikam: Remove 5.7.0-r3

Package-Manager: Portage-2.3.33, Repoman-2.3.9

 media-gfx/digikam/Manifest |   1 -
 media-gfx/digikam/digikam-5.7.0-r3.ebuild  | 174 -
 .../digikam/files/digikam-5.7.0-kcalcore-1.patch   |  44 --
 .../digikam/files/digikam-5.7.0-kcalcore-2.patch   |  79 --
 .../digikam/files/digikam-5.7.0-kreadconfig5.patch |  28 
 .../files/digikam-5.7.0-mariadb-10.2-1.patch   |  58 ---
 .../files/digikam-5.7.0-mariadb-10.2-2.patch   | 117 --
 .../digikam/files/digikam-5.7.0-qt-5.9.3.patch |  32 
 8 files changed, 533 deletions(-)

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index d23807cfbbd..0cb547b5865 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1 @@
-DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 
0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef
 SHA512 
626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
 DIST digikam-5.9.0.tar.xz 132931184 BLAKE2B 
cfbcbae8471c9c00bdf846d13bbc1ce3fbbd2ee4cc86500d011f9e15c1a21d7799638f94708794e8bc36a200df455667f9df8fcefdc38aaa00060630807d11cb
 SHA512 
f6134a957dcd11343e34f0bc90f5560a28ed205c47d2ffd76a5418a4c63f76706045e9179c47f1448304b59081051b524f7a6847c3c1dcee4673047ce5d90e63

diff --git a/media-gfx/digikam/digikam-5.7.0-r3.ebuild 
b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
deleted file mode 100644
index fb65507f36b..000
--- a/media-gfx/digikam/digikam-5.7.0-r3.ebuild
+++ /dev/null
@@ -1,174 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   KDE_HANDBOOK="true"
-   KDE_TEST="true"
-fi
-CMAKE_MAKEFILE_GENERATOR="emake"
-KDE_APPS_MINIMAL="17.12.0"
-inherit kde5 toolchain-funcs
-
-DESCRIPTION="Digital photo management application"
-HOMEPAGE="https://www.digikam.org/;
-
-LICENSE="GPL-2"
-IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer 
semantic-desktop mysql opengl openmp +panorama scanner X"
-
-if [[ ${KDE_BUILD_TYPE} != live ]]; then
-   KEYWORDS="amd64 x86"
-   MY_PV=${PV/_/-}
-   MY_P=${PN}-${MY_PV}
-   SRC_BRANCH=stable
-   [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
-   SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
-   S="${WORKDIR}/${MY_P}/core"
-fi
-
-COMMON_DEPEND="
-   $(add_frameworks_dep kconfig)
-   $(add_frameworks_dep kconfigwidgets)
-   $(add_frameworks_dep kcoreaddons)
-   $(add_frameworks_dep ki18n)
-   $(add_frameworks_dep kiconthemes)
-   $(add_frameworks_dep kio)
-   $(add_frameworks_dep knotifications)
-   $(add_frameworks_dep knotifyconfig)
-   $(add_frameworks_dep kservice)
-   $(add_frameworks_dep kwidgetsaddons)
-   $(add_frameworks_dep kwindowsystem)
-   $(add_frameworks_dep kxmlgui)
-   $(add_frameworks_dep solid)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtdbus)
-   $(add_qt_dep qtgui '-gles2')
-   $(add_qt_dep qtprintsupport)
-   $(add_qt_dep qtsql 'mysql?')
-   $(add_qt_dep qtwebkit)
-   $(add_qt_dep qtwidgets)
-   $(add_qt_dep qtxml)
-   dev-libs/expat
-   >=media-gfx/exiv2-0.26:=
-   media-libs/lcms:2
-   media-libs/liblqr
-   media-libs/libpng:0=
-   media-libs/opencv:=[-qt4(-)]
-   || ( =media-libs/opencv-3.1.0 )
-   media-libs/tiff:0
-   virtual/jpeg:0
-   addressbook? (
-   $(add_kdeapps_dep akonadi-contacts)
-   $(add_kdeapps_dep kcontacts)
-   )
-   calendar? ( $(add_kdeapps_dep kcalcore) )
-   gphoto2? ( media-libs/libgphoto2:= )
-   jpeg2k? ( media-libs/jasper:= )
-   kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
-   lensfun? ( media-libs/lensfun )
-   marble? (
-   $(add_frameworks_dep kbookmarks)
-   $(add_kdeapps_dep marble)
-   $(add_qt_dep qtconcurrent)
-   $(add_qt_dep qtnetwork)
-   )
-   mediaplayer? ( media-libs/qtav[opengl] )
-   mysql? ( virtual/mysql[server] )
-   opengl? (
-   $(add_qt_dep qtopengl)
-   virtual/opengl
-   )
-   panorama? ( $(add_frameworks_dep threadweaver) )
-   scanner? ( $(add_kdeapps_dep libksane) )
-   semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
-   X? (
-   $(add_qt_dep qtx11extras)
-   x11-libs/libX11
-   )
-"

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2017-12-18 Thread Andreas Sturmlechner
commit: 68dc4f7818a96861e2962f3e5e3212aac7e9f074
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Dec 18 18:37:38 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Dec 18 18:48:18 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68dc4f78

media-gfx/digikam: Fix build/runtime w/ >=kde-apps/kcalcore-17.12.0

Closes: https://bugs.gentoo.org/641594
Closes: https://bugs.gentoo.org/641378
Package-Manager: Portage-2.3.19, Repoman-2.3.6

 media-gfx/digikam/digikam-5.7.0-r3.ebuild  | 175 +
 .../digikam/files/digikam-5.7.0-kcalcore-1.patch   |  44 ++
 .../digikam/files/digikam-5.7.0-kcalcore-2.patch   |  79 ++
 3 files changed, 298 insertions(+)

diff --git a/media-gfx/digikam/digikam-5.7.0-r3.ebuild 
b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
new file mode 100644
index 000..bedb0c1673d
--- /dev/null
+++ b/media-gfx/digikam/digikam-5.7.0-r3.ebuild
@@ -0,0 +1,175 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   KDE_HANDBOOK="true"
+   KDE_TEST="true"
+fi
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit kde5 toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/;
+
+LICENSE="GPL-2"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer 
semantic-desktop mysql opengl openmp +panorama scanner X"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   KEYWORDS="~amd64 ~x86"
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-${MY_PV}
+   SRC_BRANCH=stable
+   [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
+   SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
+   S="${WORKDIR}/${MY_P}/core"
+fi
+
+# TODO: Package QtAV http://www.qtav.org/
+# video? ( media-video/qtav )
+COMMON_DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep solid)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui '-gles2')
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsql 'mysql?')
+   $(add_qt_dep qtwebkit)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-libs/expat
+   >=media-gfx/exiv2-0.26:=
+   media-libs/lcms:2
+   media-libs/liblqr
+   media-libs/libpng:0=
+   media-libs/opencv:=[-qt4(-)]
+   || ( =media-libs/opencv-3.1.0 )
+   media-libs/tiff:0
+   virtual/jpeg:0
+   addressbook? (
+   $(add_kdeapps_dep akonadi-contacts)
+   $(add_kdeapps_dep kcontacts)
+   )
+   calendar? ( $(add_kdeapps_dep kcalcore) )
+   gphoto2? ( media-libs/libgphoto2:= )
+   jpeg2k? ( media-libs/jasper:= )
+   kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
+   lensfun? ( media-libs/lensfun )
+   marble? (
+   $(add_frameworks_dep kbookmarks)
+   $(add_kdeapps_dep marble)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtnetwork)
+   )
+   mediaplayer? ( media-libs/qtav[opengl] )
+   mysql? ( virtual/mysql[server] )
+   opengl? (
+   $(add_qt_dep qtopengl)
+   virtual/opengl
+   )
+   panorama? ( $(add_frameworks_dep threadweaver) )
+   scanner? ( $(add_kdeapps_dep libksane) )
+   semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-cpp/eigen:3
+   dev-libs/boost[threads]
+   sys-devel/gettext
+   panorama? (
+   sys-devel/bison
+   sys-devel/flex
+   )
+"
+RDEPEND="${COMMON_DEPEND}
+   media-plugins/kipi-plugins:5
+   panorama? ( media-gfx/hugin )
+   !media-gfx/digikam:4
+"
+
+RESTRICT=test
+# bug 366505
+
+PATCHES=(
+   "${FILESDIR}"/${P}-qt-5.9.3.patch
+   "${FILESDIR}"/${P}-mariadb-10.2-{1,2}.patch
+   "${FILESDIR}"/${P}-kreadconfig5.patch
+   "${FILESDIR}"/${P}-kcalcore-{1,2}.patch
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+   kde5_pkg_pretend
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+   kde5_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_prepare() {
+   if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   # prepare the translations
+   mv 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2017-12-06 Thread Andreas Sturmlechner
commit: 12401247632313d3494f864cf75d38916ed2aad4
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Dec  6 21:46:09 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Dec  6 22:08:00 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12401247

media-gfx/digikam: Fix cleanup_digikamdb, DB w/ >=mariadb-10.2

Closes: https://bugs.gentoo.org/639032
Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/digikam/digikam-5.7.0-r2.ebuild  | 174 +
 .../digikam/files/digikam-5.7.0-kreadconfig5.patch |  28 
 .../files/digikam-5.7.0-mariadb-10.2-1.patch   |  58 +++
 .../files/digikam-5.7.0-mariadb-10.2-2.patch   | 117 ++
 4 files changed, 377 insertions(+)

diff --git a/media-gfx/digikam/digikam-5.7.0-r2.ebuild 
b/media-gfx/digikam/digikam-5.7.0-r2.ebuild
new file mode 100644
index 000..0b1c44fc5b4
--- /dev/null
+++ b/media-gfx/digikam/digikam-5.7.0-r2.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   KDE_HANDBOOK="true"
+   KDE_TEST="true"
+fi
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit kde5 toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/;
+
+LICENSE="GPL-2"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer 
semantic-desktop mysql opengl openmp +panorama scanner X"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   KEYWORDS="~amd64 ~x86"
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-${MY_PV}
+   SRC_BRANCH=stable
+   [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
+   SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
+   S="${WORKDIR}/${MY_P}/core"
+fi
+
+# TODO: Package QtAV http://www.qtav.org/
+# video? ( media-video/qtav )
+COMMON_DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep solid)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui '-gles2')
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsql 'mysql?')
+   $(add_qt_dep qtwebkit)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-libs/expat
+   >=media-gfx/exiv2-0.26:=
+   media-libs/lcms:2
+   media-libs/liblqr
+   media-libs/libpng:0=
+   media-libs/opencv:=[-qt4(-)]
+   || ( =media-libs/opencv-3.1.0 )
+   media-libs/tiff:0
+   virtual/jpeg:0
+   addressbook? (
+   $(add_kdeapps_dep akonadi-contacts)
+   $(add_kdeapps_dep kcontacts)
+   )
+   calendar? ( $(add_kdeapps_dep kcalcore) )
+   gphoto2? ( media-libs/libgphoto2:= )
+   jpeg2k? ( media-libs/jasper:= )
+   kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
+   lensfun? ( media-libs/lensfun )
+   marble? (
+   $(add_frameworks_dep kbookmarks)
+   $(add_kdeapps_dep marble)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtnetwork)
+   )
+   mediaplayer? ( media-libs/qtav[opengl] )
+   mysql? ( virtual/mysql[server] )
+   opengl? (
+   $(add_qt_dep qtopengl)
+   virtual/opengl
+   )
+   panorama? ( $(add_frameworks_dep threadweaver) )
+   scanner? ( $(add_kdeapps_dep libksane) )
+   semantic-desktop? ( $(add_frameworks_dep kfilemetadata) )
+   X? (
+   $(add_qt_dep qtx11extras)
+   x11-libs/libX11
+   )
+"
+DEPEND="${COMMON_DEPEND}
+   dev-cpp/eigen:3
+   dev-libs/boost[threads]
+   sys-devel/gettext
+   panorama? (
+   sys-devel/bison
+   sys-devel/flex
+   )
+"
+RDEPEND="${COMMON_DEPEND}
+   media-plugins/kipi-plugins:5
+   panorama? ( media-gfx/hugin )
+   !media-gfx/digikam:4
+"
+
+RESTRICT=test
+# bug 366505
+
+PATCHES=(
+   "${FILESDIR}"/${P}-qt-5.9.3.patch
+   "${FILESDIR}"/${P}-mariadb-10.2-{1,2}.patch
+   "${FILESDIR}"/${P}-kreadconfig5.patch
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+   kde5_pkg_pretend
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+   kde5_pkg_setup
+}
+
+# FIXME: Unbundle libraw (libs/rawengine/libraw)
+src_prepare() {
+   if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   # prepare the translations
+   mv "${WORKDIR}/${MY_P}/po" po 

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2017-11-29 Thread Andreas Sturmlechner
commit: 1ea80d97051243f63b8ea8b128ef02eacfd10c97
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Wed Nov 29 18:37:29 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Wed Nov 29 18:59:57 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ea80d97

media-gfx/digikam: Fix Qt-5.9.3 runtime issue w/ album view

See also: https://bugs.kde.org/show_bug.cgi?id=387373

Package-Manager: Portage-2.3.16, Repoman-2.3.6

 media-gfx/digikam/Manifest |   2 +-
 media-gfx/digikam/digikam-5.7.0-r1.ebuild  | 170 +
 .../digikam/files/digikam-5.7.0-qt-5.9.3.patch |  31 
 3 files changed, 202 insertions(+), 1 deletion(-)

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c301533b1d9..b7c758d7e77 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,2 +1,2 @@
 DIST digikam-5.5.0.tar.xz 129499600 SHA256 
df9cbf1b8dbfb9235cebc97e77c02fcb1498c5a905c7fd3b9fb42fd7accc6252 SHA512 
3c64774916d4804d932009ba3753d387ecf31e9e3d435c580497d3badb6cc3e57ab5ef1a2334a23379d0987d96dd107be4f01adbb63039f4510aa94ac6d71344
 WHIRLPOOL 
e67b444975ad37e939b2f62bba949bcafb41eee2975470daa02e4ffdd62c6c792b6656edf4811daead52fdc1bf064951fbec7b687192e5d5ee542d5d706140be
-DIST digikam-5.7.0.tar.xz 123315064 SHA256 
3605ffb5b6e8fbd6b725e5075f74f505d7edee7531789c2882d11df2d20150f5 SHA512 
626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4
 WHIRLPOOL 
b452919ce9bcf8ccc8434586ace23b96b68b76f49d7229d418b2dc5883e9646c79fb99ecd660d732b8d96efc3a49b70d218756b09a3f16ef9f7f2b174679be70
+DIST digikam-5.7.0.tar.xz 123315064 BLAKE2B 
0879b25e674e39d204038ab629dec36757ae034e3dd7e9a0a3700f9703272c4a972a21c1db5a42c6c294247a1226b1cb9a8b980bb90cdcc12e0cd752459273ef
 SHA512 
626c9854311c637b994325237f171adce3dba39159fb336dfe95f1de287e2d08a3aaddd611eea87e8018047d331aff252b555c382cfbe1d8e14413c51a3849f4

diff --git a/media-gfx/digikam/digikam-5.7.0-r1.ebuild 
b/media-gfx/digikam/digikam-5.7.0-r1.ebuild
new file mode 100644
index 000..62c259e566c
--- /dev/null
+++ b/media-gfx/digikam/digikam-5.7.0-r1.ebuild
@@ -0,0 +1,170 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   KDE_HANDBOOK="true"
+   KDE_TEST="true"
+fi
+CMAKE_MAKEFILE_GENERATOR="emake"
+inherit kde5 toolchain-funcs
+
+DESCRIPTION="Digital photo management application"
+HOMEPAGE="https://www.digikam.org/;
+
+LICENSE="GPL-2"
+IUSE="addressbook calendar gphoto2 jpeg2k +kipi +lensfun marble mediaplayer 
semantic-desktop mysql opengl openmp +panorama scanner X"
+
+if [[ ${KDE_BUILD_TYPE} != live ]]; then
+   KEYWORDS="~amd64 ~x86"
+   MY_PV=${PV/_/-}
+   MY_P=${PN}-${MY_PV}
+   SRC_BRANCH=stable
+   [[ ${PV} =~ beta[0-9]$ ]] && SRC_BRANCH=unstable
+   SRC_URI="mirror://kde/${SRC_BRANCH}/digikam/${MY_P}.tar.xz"
+   S="${WORKDIR}/${MY_P}/core"
+fi
+
+# TODO: Package QtAV http://www.qtav.org/
+# video? ( media-video/qtav )
+COMMON_DEPEND="
+   $(add_frameworks_dep kconfig)
+   $(add_frameworks_dep kconfigwidgets)
+   $(add_frameworks_dep kcoreaddons)
+   $(add_frameworks_dep ki18n)
+   $(add_frameworks_dep kiconthemes)
+   $(add_frameworks_dep kio)
+   $(add_frameworks_dep knotifications)
+   $(add_frameworks_dep knotifyconfig)
+   $(add_frameworks_dep kservice)
+   $(add_frameworks_dep kwidgetsaddons)
+   $(add_frameworks_dep kwindowsystem)
+   $(add_frameworks_dep kxmlgui)
+   $(add_frameworks_dep solid)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtdbus)
+   $(add_qt_dep qtgui '-gles2')
+   $(add_qt_dep qtprintsupport)
+   $(add_qt_dep qtsql 'mysql?')
+   $(add_qt_dep qtwebkit)
+   $(add_qt_dep qtwidgets)
+   $(add_qt_dep qtxml)
+   dev-libs/expat
+   >=media-gfx/exiv2-0.26:=
+   media-libs/lcms:2
+   media-libs/liblqr
+   media-libs/libpng:0=
+   media-libs/opencv:=[-qt4(-)]
+   || ( =media-libs/opencv-3.1.0 )
+   media-libs/tiff:0
+   virtual/jpeg:0
+   addressbook? (
+   $(add_kdeapps_dep akonadi-contacts)
+   $(add_kdeapps_dep kcontacts)
+   )
+   calendar? ( $(add_kdeapps_dep kcalcore) )
+   gphoto2? ( media-libs/libgphoto2:= )
+   jpeg2k? ( media-libs/jasper:= )
+   kipi? ( $(add_kdeapps_dep libkipi '' '16.03.80') )
+   lensfun? ( media-libs/lensfun )
+   marble? (
+   $(add_frameworks_dep kbookmarks)
+   $(add_kdeapps_dep marble)
+   $(add_qt_dep qtconcurrent)
+   $(add_qt_dep qtnetwork)
+   )
+   mediaplayer? ( media-libs/qtav[opengl] )
+   mysql? ( virtual/mysql[server] )
+   opengl? (
+   $(add_qt_dep qtopengl)
+   virtual/opengl
+   )
+   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2016-12-08 Thread Johannes Huber
commit: 8203a96a596336e05b490098c109812bb095ea8c
Author: Johannes Huber  gentoo  org>
AuthorDate: Thu Dec  8 17:43:55 2016 +
Commit: Johannes Huber  gentoo  org>
CommitDate: Thu Dec  8 17:43:55 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8203a96a

media-gfx/digikam: Drop slot 4

Package-Manager: portage-2.3.3

 media-gfx/digikam/Manifest |   2 -
 media-gfx/digikam/digikam-4.14.0-r1.ebuild | 133 --
 media-gfx/digikam/digikam-4.4.0-r1.ebuild  | 156 -
 .../digikam/files/digikam-4.14.0-lensfun.patch |  26 
 media-gfx/digikam/files/digikam-4.4.0-hang.patch   |  85 ---
 .../digikam/files/digikam-4.4.0-libkexiv2.patch|  53 ---
 media-gfx/digikam/metadata.xml |   2 -
 7 files changed, 457 deletions(-)

diff --git a/media-gfx/digikam/Manifest b/media-gfx/digikam/Manifest
index c0d6405..322cdee 100644
--- a/media-gfx/digikam/Manifest
+++ b/media-gfx/digikam/Manifest
@@ -1,3 +1 @@
-DIST digikam-4.14.0.tar.bz2 59805228 SHA256 
9d7bcb689d8c29be2e81976f0a043220f442a24f2071284044e7f1a799a7fdad SHA512 
3029e9b67d9d055bd9aee0d6d01e87950702e026f9f44b513155946ba087ec58b300f945a035a418afae45365ed007d8db6a1a90ed1d391e5e0e4cb679168ccf
 WHIRLPOOL 
35a3caedc9a4799f161b26b3b4df51da18a31be50a8a6da5b12a339a353755d73a47f103099087e3dc8e6926f65ae19638efea3585c86f72173a086056bf48ce
-DIST digikam-4.4.0.tar.bz2 68871203 SHA256 
5c68a2d200f5b502706128ea64839319aad333fb79548f49ecc92594e280d4e9 SHA512 
4992fad1e574fc44eac53f3ac8d4ab78ccbf8e04beb54a211a9afc20af1efb6f8bacedea07e403f490e7f70a74ed5ac02d4f9b939dfaf25f64a4a9bda0a7d94a
 WHIRLPOOL 
7a05ab9926227232a1cf52bf68da45b849b982e840b171f702610acce85a1ce8e59967a02e845a0ef19c316daee835861573aca40dc7b28422cf7d6d56119e2c
 DIST digikam-5.3.0.tar.xz 121417224 SHA256 
b36cfa27278936d41ab5f33c99fe9ccdfd545eada3e1e32efe9f9e3fdf2c3e5c SHA512 
6190944d09badec6ddac194f2029e86d0ef658e08a6a120f04c86109dc2b9d9cd2e772a900d09781b563fcd0caaff186fb5fd6cde9744ce3b4e8dcc9ff29d421
 WHIRLPOOL 
c1c0987e23587356968484d936a0a99f10d6e6ce004ffe1f5eb4d0a42b59fc1e84ec4a03f491c91c93be172ab6b78444c684221fb515e1562cc76bcc61346158

diff --git a/media-gfx/digikam/digikam-4.14.0-r1.ebuild 
b/media-gfx/digikam/digikam-4.14.0-r1.ebuild
deleted file mode 100644
index 744d58e..
--- a/media-gfx/digikam/digikam-4.14.0-r1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-KDE_LINGUAS="ar be bg bs ca cs da de el en_GB eo es et eu fa fi fr ga gl he hi
-hr hu is it ja km ko lt lv ms nb nds ne nl nn pa pl pt pt_BR ro ru se sk sl sq
-sv th tr uk vi zh_CN zh_TW"
-KDE_HANDBOOK="optional"
-KDE_DOC_DIRS="doc-digikam doc-showfoto"
-inherit kde4-base
-
-MY_PV=${PV/_/-}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="Digital photo management application for KDE"
-HOMEPAGE="http://www.digikam.org/;
-SRC_URI="mirror://kde/stable/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2
-   handbook? ( FDL-1.2 )"
-KEYWORDS="~amd64 ~x86"
-SLOT="4"
-IUSE="addressbook debug doc gphoto2 mysql semantic-desktop +thumbnails video"
-
-CDEPEND="
-   $(add_kdebase_dep kdelibs '' 4.14.14)
-   kde-apps/kdebase-kioslaves:4
-   kde-apps/libkdcraw:4=
-   kde-apps/libkexiv2:4=
-   >=kde-apps/libkface-15.08.2-r1:4
-   kde-apps/libkgeomap:4=
-   kde-apps/libkipi:4
-   kde-apps/kcmshell:4
-   dev-qt/qtgui:4
-   || ( dev-qt/qtsql:4[mysql] dev-qt/qtsql:4[sqlite] )
-   media-libs/jasper:=
-   media-libs/lcms:2
-   >=media-libs/lensfun-0.2.6
-   media-libs/liblqr
-   >=media-libs/libpgf-6.12.27
-   media-libs/libpng:0=
-   media-libs/opencv:=[contrib(+),-qt5]
-   media-libs/phonon[qt4]
-   >=media-libs/tiff-3.8.2:0
-   virtual/jpeg:0
-   x11-libs/libX11
-   addressbook? ( $(add_kdeapps_dep kdepimlibs) )
-   gphoto2? ( media-libs/libgphoto2:= )
-   mysql? ( virtual/mysql )
-   semantic-desktop? ( kde-frameworks/baloo:4 )
-"
-RDEPEND="${CDEPEND}
-   $(add_kdeapps_dep kreadconfig)
-   media-plugins/kipi-plugins:4
-   video? ( $(add_kdeapps_dep ffmpegthumbs) )
-"
-DEPEND="${CDEPEND}
-   dev-cpp/eigen:3
-   dev-libs/boost
-   sys-devel/gettext
-   doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}/core"
-
-RESTRICT=test
-# bug 366505
-
-PATCHES=( "${FILESDIR}/${PN}-4.14.0-lensfun.patch" ) # bug 566624
-
-src_prepare() {
-   # just to make absolutely sure
-   rm -rf "${WORKDIR}/${MY_P}/extra" || die
-
-   # prepare the handbook
-   mkdir doc-digikam doc-showfoto || die
-   echo "add_subdirectory( en )" > doc-digikam/CMakeLists.txt || die
-   mv "${WORKDIR}/${MY_P}/doc/${PN}/digikam" doc-digikam/en || die
-   echo "add_subdirectory( en )" > doc-showfoto/CMakeLists.txt || die
-   mv "${WORKDIR}/${MY_P}/doc/${PN}/showfoto" doc-showfoto/en || die
-   

[gentoo-commits] repo/gentoo:master commit in: media-gfx/digikam/files/, media-gfx/digikam/

2015-12-29 Thread Michael Palimaka
commit: d504999f6d7ca07e021381af9091b126656cac43
Author: Andreas Sturmlechner  gmail  com>
AuthorDate: Tue Dec 29 15:07:20 2015 +
Commit: Michael Palimaka  gentoo  org>
CommitDate: Tue Dec 29 16:01:58 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d504999f

media-gfx/digikam: Fix build w/ media-libs/lensfun-0.3.2, bug 566624

Package-Manager: portage-2.2.24

 media-gfx/digikam/digikam-4.12.0.ebuild|  2 ++
 media-gfx/digikam/digikam-4.14.0.ebuild|  2 ++
 media-gfx/digikam/digikam-4.4.0-r1.ebuild  |  1 +
 .../digikam/files/digikam-4.14.0-lensfun.patch | 26 ++
 4 files changed, 31 insertions(+)

diff --git a/media-gfx/digikam/digikam-4.12.0.ebuild 
b/media-gfx/digikam/digikam-4.12.0.ebuild
index e78ff14..24f27f7 100644
--- a/media-gfx/digikam/digikam-4.12.0.ebuild
+++ b/media-gfx/digikam/digikam-4.12.0.ebuild
@@ -71,6 +71,8 @@ S="${WORKDIR}/${MY_P}/core"
 RESTRICT=test
 # bug 366505
 
+PATCHES=( "${FILESDIR}/${PN}-4.14.0-lensfun.patch" ) # bug 566624
+
 src_prepare() {
# just to make absolutely sure
rm -rf "${WORKDIR}/${MY_P}/extra" || die

diff --git a/media-gfx/digikam/digikam-4.14.0.ebuild 
b/media-gfx/digikam/digikam-4.14.0.ebuild
index cf97a95..bd44576 100644
--- a/media-gfx/digikam/digikam-4.14.0.ebuild
+++ b/media-gfx/digikam/digikam-4.14.0.ebuild
@@ -72,6 +72,8 @@ S="${WORKDIR}/${MY_P}/core"
 RESTRICT=test
 # bug 366505
 
+PATCHES=( "${FILESDIR}/${PN}-4.14.0-lensfun.patch" ) # bug 566624
+
 src_prepare() {
# just to make absolutely sure
rm -rf "${WORKDIR}/${MY_P}/extra" || die

diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild 
b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
index 57376c3..993d5f9 100644
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild
@@ -82,6 +82,7 @@ RESTRICT=test
 PATCHES=(
"${FILESDIR}/${P}-libkexiv2.patch"
"${FILESDIR}/${P}-hang.patch"
+   "${FILESDIR}/${PN}-4.14.0-lensfun.patch" # bug 566624
 )
 
 src_prepare() {

diff --git a/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch 
b/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch
new file mode 100644
index 000..37776f6
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch
@@ -0,0 +1,26 @@
+From: Gilles Caulier 
+Date: Mon, 14 Dec 2015 21:41:55 +
+Subject: fix compilation with Lensfun 0.3.2
+X-Git-Url: 
http://quickgit.kde.org/?p=digikam.git=commitdiff=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 
+-}
+ 
+ // Local includes
+ 
+