Skip to content

Commit

Permalink
media-gfx/digikam: Fix build w/ media-libs/lensfun-0.3.2, bug 566624
Browse files Browse the repository at this point in the history
Package-Manager: portage-2.2.24
  • Loading branch information
a17r authored and kensington committed Dec 29, 2015
1 parent 0ddb9fc commit d504999
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 0 deletions.
2 changes: 2 additions & 0 deletions media-gfx/digikam/digikam-4.12.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions media-gfx/digikam/digikam-4.14.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions media-gfx/digikam/digikam-4.4.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
26 changes: 26 additions & 0 deletions media-gfx/digikam/files/digikam-4.14.0-lensfun.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
From: Gilles Caulier <[email protected]>
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


0 comments on commit d504999

Please sign in to comment.