Fixing build failure, fixes #283444. Thanks to Alexandre Rostovtsev for the upstream patch and modified ebuild.

(Portage version: 2.2_rc40/cvs/Linux x86_64)

3 files changed, 125 insertions, 1 deletions

diff --git a/media-libs/gegl/ChangeLog b/media-libs/gegl/ChangeLog
index f0dc28f14fa2..448d78907192 100644
--- a/media-libs/gegl/ChangeLog
+++ b/media-libs/gegl/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-libs/gegl
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.27 2009/09/01 08:52:21 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/ChangeLog,v 1.28 2009/09/18 01:45:39 patrick Exp $
+
+*gegl-0.1.0-r1 (18 Sep 2009)
+
+  18 Sep 2009; Patrick Lauer <patrick@gentoo.org> +gegl-0.1.0-r1.ebuild,
+  +files/gegl-0.1.0-GLIB_CFLAGS.patch:
+  Fixing build failure, fixes #283444. Thanks to Alexandre Rostovtsev for
+  the upstream patch and modified ebuild.
 
 *gegl-0.1.0 (01 Sep 2009)
 
diff --git a/media-libs/gegl/files/gegl-0.1.0-GLIB_CFLAGS.patch b/media-libs/gegl/files/gegl-0.1.0-GLIB_CFLAGS.patch
new file mode 100644
index 000000000000..e5d03e549b52
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.1.0-GLIB_CFLAGS.patch
@@ -0,0 +1,47 @@
+From b5e6f4f1f9c5038050387898581884fe73b7dc0f Mon Sep 17 00:00:00 2001
+From: Nils Philippsen <nils@redhat.com>
+Date: Fri, 03 Jul 2009 13:04:12 +0000
+Subject: Bug 587684 – building gegl fails in operations/workshop/external
+
+Add $(GLIB_CFLAGS), $(BABL_CFLAGS) where missing
+---
+diff --git a/operations/workshop/external/Makefile.am b/operations/workshop/external/Makefile.am
+index 5a3b85b..075427a 100644
+--- a/operations/workshop/external/Makefile.am
++++ b/operations/workshop/external/Makefile.am
+@@ -7,7 +7,7 @@ ops =
+ if HAVE_CAIRO
+ line_profile_la_SOURCES = line-profile.c
+ line_profile_la_LIBADD = $(op_libs) $(CAIRO_LIBS) $(PANGO_LIBS)
+-line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(BABL_CFLAGS)
++line_profile_la_CFLAGS = $(CAIRO_CFLAGS) $(PANGO_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
+ ops += line_profile.la
+ endif
+ 
+@@ -15,21 +15,21 @@ if HAVE_GTK
+ ops += gtk_display.la
+ gtk_display_la_SOURCES = gtk-display.c
+ gtk_display_la_LIBADD  = $(op_libs) $(GTK_LIBS)
+-gtk_display_la_CFLAGS  = $(GTK_CFLAGS) $(BABL_CFLAGS)
++gtk_display_la_CFLAGS  = $(GTK_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
+ endif
+ 
+ if HAVE_AVFORMAT
+ ops += ff_save.la
+ ff_save_la_SOURCES = ff-save.c
+ ff_save_la_LIBADD = $(op_libs) $(AVFORMAT_LIBS) -lswscale
+-ff_save_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS)
++ff_save_la_CFLAGS = $(AM_CFLAGS) $(AVFORMAT_CFLAGS) $(GLIB_CFLAGS)
+ endif
+ 
+ if HAVE_LUA
+ ops += gluas.la
+ gluas_la_SOURCES = gluas.c
+ gluas_la_LIBADD  = $(op_libs) $(LUA_LIBS)
+-gluas_la_CFLAGS  = $(LUA_CFLAGS)
++gluas_la_CFLAGS  = $(LUA_CFLAGS) $(BABL_CFLAGS) $(GLIB_CFLAGS)
+ endif
+ 
+ opdir = $(libdir)/gegl-@GEGL_API_VERSION@
+--
+cgit v0.8.2
diff --git a/media-libs/gegl/gegl-0.1.0-r1.ebuild b/media-libs/gegl/gegl-0.1.0-r1.ebuild
new file mode 100644
index 000000000000..faf6ba019985
--- /dev/null
+++ b/media-libs/gegl/gegl-0.1.0-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/gegl/gegl-0.1.0-r1.ebuild,v 1.1 2009/09/18 01:45:39 patrick Exp $
+
+EAPI="2"
+
+inherit autotools eutils
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+SRC_URI="ftp://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cairo debug doc ffmpeg jpeg mmx openexr png raw sdl sse svg v4l"
+
+DEPEND=">=media-libs/babl-0.1.0
+	>=dev-libs/glib-2.18.0
+	media-libs/libpng
+	>=x11-libs/gtk+-2.14.0
+	x11-libs/pango
+	cairo? ( x11-libs/cairo )
+	doc? ( app-text/asciidoc
+		dev-lang/ruby
+		>=dev-lang/lua-5.1.0
+		app-text/enscript
+		media-gfx/graphviz
+		media-gfx/imagemagick[png] )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20080326 )
+	jpeg? ( media-libs/jpeg )
+	openexr? ( media-libs/openexr )
+	raw? ( >=media-libs/libopenraw-0.0.5 )
+	sdl? ( media-libs/libsdl )
+	svg? ( >=gnome-base/librsvg-2.14.0 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	# Fix operations/workshop/external CFLAGS, bug #283444
+	epatch "${FILESDIR}/${P}-GLIB_CFLAGS.patch"
+	eautoreconf
+}
+
+src_configure() {
+	econf --with-gtk --with-pango --with-gdk-pixbuf \
+		$(use_enable debug) \
+		$(use_with cairo) \
+		$(use_with cairo pangocairo) \
+		$(use_with v4l libv4l) \
+		$(use_enable doc docs) \
+		$(use_with doc graphviz) \
+		$(use_with doc lua) \
+		$(use_enable doc workshop) \
+		$(use_with ffmpeg libavformat) \
+		$(use_with jpeg libjpeg) \
+		$(use_enable mmx) \
+		$(use_with openexr) \
+		$(use_with png libpng) \
+		$(use_with raw libopenraw) \
+		$(use_with sdl) \
+		$(use_with svg librsvg) \
+		$(use_enable sse)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	find "${D}" -name '*.la' -delete
+	dodoc ChangeLog INSTALL README NEWS || die "dodoc failed"
+}