summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'media-gfx')
-rw-r--r--media-gfx/ufraw/ChangeLog6
-rw-r--r--media-gfx/ufraw/files/ufraw-0.19.2-clang.patch27
-rw-r--r--media-gfx/ufraw/ufraw-0.19.2.ebuild6
3 files changed, 36 insertions, 3 deletions
diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog
index 83a80f23e023..69c70433913f 100644
--- a/media-gfx/ufraw/ChangeLog
+++ b/media-gfx/ufraw/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/ufraw
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.118 2014/01/12 11:19:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.119 2014/06/15 10:16:57 maekke Exp $
+
+ 15 Jun 2014; Markus Meier <maekke@gentoo.org> ufraw-0.19.2.ebuild,
+ +files/ufraw-0.19.2-clang.patch:
+ fix building with clang by Priit Laes in bug #513054
12 Jan 2014; Markus Meier <maekke@gentoo.org> ufraw-0.19.2.ebuild:
add missing media-libs/libpng dep, use subslot operator deps
diff --git a/media-gfx/ufraw/files/ufraw-0.19.2-clang.patch b/media-gfx/ufraw/files/ufraw-0.19.2-clang.patch
new file mode 100644
index 000000000000..a95f98ec81a7
--- /dev/null
+++ b/media-gfx/ufraw/files/ufraw-0.19.2-clang.patch
@@ -0,0 +1,27 @@
+https://bugs.gentoo.org/show_bug.cgi?id=513054
+http://sourceforge.net/p/ufraw/bugs/365/
+
+--- ufraw.h.orig 2014-01-11 11:04:08.000000000 -0800
++++ ufraw.h 2014-01-11 11:04:54.000000000 -0800
+@@ -41,6 +41,10 @@
+ /* An impossible value for conf float values */
+ #define NULLF -10000.0
+
++#ifdef __cplusplus
++extern "C" {
++#endif // __cplusplus
++
+ /* Options, like auto-adjust buttons can be in 3 states. Enabled and disabled
+ * are obvious. Apply means that the option was selected and some function
+ * has to act accourdingly, before changing to one of the first two states */
+@@ -78,10 +82,6 @@ extern UFName ufRawImage;
+ extern UFName ufRawResources;
+ extern UFName ufCommandLine;
+
+-#ifdef __cplusplus
+-extern "C" {
+-#endif // __cplusplus
+-
+ UFObject *ufraw_image_new();
+ #ifdef HAVE_LENSFUN
+ UFObject *ufraw_lensfun_new();
diff --git a/media-gfx/ufraw/ufraw-0.19.2.ebuild b/media-gfx/ufraw/ufraw-0.19.2.ebuild
index 0fe24b3b3bb5..37d1f5989ec3 100644
--- a/media-gfx/ufraw/ufraw-0.19.2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.19.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.19.2.ebuild,v 1.14 2014/01/12 11:19:16 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.19.2.ebuild,v 1.15 2014/06/15 10:16:57 maekke Exp $
EAPI=5
inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
@@ -32,7 +32,9 @@ DEPEND="${RDEPEND}
virtual/pkgconfig"
src_prepare() {
- epatch "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch
+ epatch \
+ "${FILESDIR}"/${PN}-0.17-cfitsio-automagic.patch \
+ "${FILESDIR}"/${P}-clang.patch
eautoreconf
}