| 1 |
commit: d504999f6d7ca07e021381af9091b126656cac43 |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Dec 29 15:07:20 2015 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Dec 29 16:01:58 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d504999f |
| 7 |
|
| 8 |
media-gfx/digikam: Fix build w/ media-libs/lensfun-0.3.2, bug 566624 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.24 |
| 11 |
|
| 12 |
media-gfx/digikam/digikam-4.12.0.ebuild | 2 ++ |
| 13 |
media-gfx/digikam/digikam-4.14.0.ebuild | 2 ++ |
| 14 |
media-gfx/digikam/digikam-4.4.0-r1.ebuild | 1 + |
| 15 |
.../digikam/files/digikam-4.14.0-lensfun.patch | 26 ++++++++++++++++++++++ |
| 16 |
4 files changed, 31 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-gfx/digikam/digikam-4.12.0.ebuild b/media-gfx/digikam/digikam-4.12.0.ebuild |
| 19 |
index e78ff14..24f27f7 100644 |
| 20 |
--- a/media-gfx/digikam/digikam-4.12.0.ebuild |
| 21 |
+++ b/media-gfx/digikam/digikam-4.12.0.ebuild |
| 22 |
@@ -71,6 +71,8 @@ S="${WORKDIR}/${MY_P}/core" |
| 23 |
RESTRICT=test |
| 24 |
# bug 366505 |
| 25 |
|
| 26 |
+PATCHES=( "${FILESDIR}/${PN}-4.14.0-lensfun.patch" ) # bug 566624 |
| 27 |
+ |
| 28 |
src_prepare() { |
| 29 |
# just to make absolutely sure |
| 30 |
rm -rf "${WORKDIR}/${MY_P}/extra" || die |
| 31 |
|
| 32 |
diff --git a/media-gfx/digikam/digikam-4.14.0.ebuild b/media-gfx/digikam/digikam-4.14.0.ebuild |
| 33 |
index cf97a95..bd44576 100644 |
| 34 |
--- a/media-gfx/digikam/digikam-4.14.0.ebuild |
| 35 |
+++ b/media-gfx/digikam/digikam-4.14.0.ebuild |
| 36 |
@@ -72,6 +72,8 @@ S="${WORKDIR}/${MY_P}/core" |
| 37 |
RESTRICT=test |
| 38 |
# bug 366505 |
| 39 |
|
| 40 |
+PATCHES=( "${FILESDIR}/${PN}-4.14.0-lensfun.patch" ) # bug 566624 |
| 41 |
+ |
| 42 |
src_prepare() { |
| 43 |
# just to make absolutely sure |
| 44 |
rm -rf "${WORKDIR}/${MY_P}/extra" || die |
| 45 |
|
| 46 |
diff --git a/media-gfx/digikam/digikam-4.4.0-r1.ebuild b/media-gfx/digikam/digikam-4.4.0-r1.ebuild |
| 47 |
index 57376c3..993d5f9 100644 |
| 48 |
--- a/media-gfx/digikam/digikam-4.4.0-r1.ebuild |
| 49 |
+++ b/media-gfx/digikam/digikam-4.4.0-r1.ebuild |
| 50 |
@@ -82,6 +82,7 @@ RESTRICT=test |
| 51 |
PATCHES=( |
| 52 |
"${FILESDIR}/${P}-libkexiv2.patch" |
| 53 |
"${FILESDIR}/${P}-hang.patch" |
| 54 |
+ "${FILESDIR}/${PN}-4.14.0-lensfun.patch" # bug 566624 |
| 55 |
) |
| 56 |
|
| 57 |
src_prepare() { |
| 58 |
|
| 59 |
diff --git a/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch b/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch |
| 60 |
new file mode 100644 |
| 61 |
index 0000000..37776f6 |
| 62 |
--- /dev/null |
| 63 |
+++ b/media-gfx/digikam/files/digikam-4.14.0-lensfun.patch |
| 64 |
@@ -0,0 +1,26 @@ |
| 65 |
+From: Gilles Caulier <caulier.gilles@×××××.com> |
| 66 |
+Date: Mon, 14 Dec 2015 21:41:55 +0000 |
| 67 |
+Subject: fix compilation with Lensfun 0.3.2 |
| 68 |
+X-Git-Url: http://quickgit.kde.org/?p=digikam.git&a=commitdiff&h=0f159981176faa6da701f112bfe557b79804d468 |
| 69 |
+--- |
| 70 |
+fix compilation with Lensfun 0.3.2 |
| 71 |
+It still compatible with older lensfun releases. |
| 72 |
+BUGS: 356672 |
| 73 |
+FIXED-IN: 5.0.0 |
| 74 |
+--- |
| 75 |
+ |
| 76 |
+ |
| 77 |
+--- a/libs/dimg/filters/lens/lensfuniface.h |
| 78 |
++++ b/libs/dimg/filters/lens/lensfuniface.h |
| 79 |
+@@ -24,10 +24,7 @@ |
| 80 |
+ |
| 81 |
+ // Lib LensFun includes |
| 82 |
+ |
| 83 |
+-extern "C" |
| 84 |
+-{ |
| 85 |
+ #include <lensfun.h> |
| 86 |
+-} |
| 87 |
+ |
| 88 |
+ // Local includes |
| 89 |
+ |
| 90 |
+ |
Archives