diff options
| author |   Andreas Sturmlechner <andreas.sturmlechner@gmail.com> | 2015-12-29 16:07:20 +0100 |
|---|---|---|
| committer |   Michael Palimaka <kensington@gentoo.org> | 2015-12-30 03:01:58 +1100 |
| commit | d504999f6d7ca07e021381af9091b126656cac43 (patch) | |
| tree | a9580c1209a8930909c29472d4bd09a10d6e76d5 /media-gfx/digikam | |
| parent | games-emulation/mednafen: version bump (diff) | |
| download | gentoo-d504999f6d7ca07e021381af9091b126656cac43.tar.gz gentoo-d504999f6d7ca07e021381af9091b126656cac43.tar.bz2 gentoo-d504999f6d7ca07e021381af9091b126656cac43.zip | |
media-gfx/digikam: Fix build w/ media-libs/lensfun-0.3.2, bug 566624
Package-Manager: portage-2.2.24
Diffstat (limited to 'media-gfx/digikam')
| -rw-r--r-- | media-gfx/digikam/digikam-4.12.0.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-4.14.0.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/digikam/digikam-4.4.0-r1.ebuild | 1 | ||||
| -rw-r--r-- | media-gfx/digikam/files/digikam-4.14.0-lensfun.patch | 26 |
4 files changed, 31 insertions, 0 deletions
diff --git a/media-gfx/digikam/digikam-4.12.0.ebuild b/media-gfx/digikam/digikam-4.12.0.ebuild index e78ff1446724..24f27f7e029f 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 cf97a9539cab..bd445769dfbb 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 57376c3737a4..993d5f995ad9 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 000000000000..37776f6e316b --- /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 + + |