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

Package-Manager: portage-2.2.24

diff --git a/media-gfx/digikam/digikam-4.12.0.ebuild b/media-gfx/digikam/digikam-4.12.0.ebuild
index e78ff14467248ff5a1b1663d60c7434770901c79..24f27f7e029f23682fc6dba704ce5ff184ed9291 100644 (file)
--- 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 cf97a9539cab61376ec3bc105a94d539a68b42d3..bd445769dfbb9413471c345b341894bf6f359166 100644 (file)
--- 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 57376c3737a4d8e0a2a8bb77dffc7b2084a6de9a..993d5f995ad9bf1d42967db969bbcc0af1721543 100644 (file)
--- 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 (file)
index 0000000..37776f6
--- /dev/null
+++ b/media-gfx/digikam/files/digikam-4.14.0-lensfun.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
+ 
+