Fix compilation against curl-7.21.7 (bug #377075)

(Portage version: 2.2.0_alpha49/cvs/Linux x86_64)

4 files changed, 27 insertions, 3 deletions

diff --git a/media-gfx/gimp/ChangeLog b/media-gfx/gimp/ChangeLog
index a76ccb4817ba..63023e596ce4 100644
--- a/media-gfx/gimp/ChangeLog
+++ b/media-gfx/gimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/gimp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.328 2011/04/19 20:08:44 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/ChangeLog,v 1.329 2011/07/30 16:03:01 angelos Exp $
+
+  30 Jul 2011; Christoph Mende <angelos@gentoo.org> gimp-2.6.11-r1.ebuild,
+  gimp-2.6.11-r2.ebuild, +files/gimp-curl-headers.diff:
+  Fix compilation against curl-7.21.7 (bug #377075)
 
 *gimp-2.6.11-r2 (19 Apr 2011)
 
diff --git a/media-gfx/gimp/files/gimp-curl-headers.diff b/media-gfx/gimp/files/gimp-curl-headers.diff
new file mode 100644
index 000000000000..ea8935d0080c
--- /dev/null
+++ b/media-gfx/gimp/files/gimp-curl-headers.diff
@@ -0,0 +1,12 @@
+diff --git a/plug-ins/file-uri/uri-backend-libcurl.c b/plug-ins/file-uri/uri-backend-libcurl.c
+index a566966..747dca7 100644
+--- a/plug-ins/file-uri/uri-backend-libcurl.c
++++ b/plug-ins/file-uri/uri-backend-libcurl.c
+@@ -24,7 +24,6 @@
+ #include <errno.h>
+ 
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ 
+ #include <glib/gstdio.h>
diff --git a/media-gfx/gimp/gimp-2.6.11-r1.ebuild b/media-gfx/gimp/gimp-2.6.11-r1.ebuild
index d8b5d9e35467..06211cce2031 100644
--- a/media-gfx/gimp/gimp-2.6.11-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild,v 1.8 2011/03/27 09:45:59 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r1.ebuild,v 1.9 2011/07/30 16:03:01 angelos Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -94,6 +94,10 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=640409
 	epatch "${FILESDIR}"/gimp-libpng15.diff
 
+	# don't use empty, removed header
+	# https://bugs.gentoo.org/show_bug.cgi?id=377075
+	epatch "${FILESDIR}"/gimp-curl-headers.diff
+
 	echo '#!/bin/sh' > py-compile
 	gnome2_src_prepare
 }
diff --git a/media-gfx/gimp/gimp-2.6.11-r2.ebuild b/media-gfx/gimp/gimp-2.6.11-r2.ebuild
index 8add3d5fd1dc..a9db0b32b131 100644
--- a/media-gfx/gimp/gimp-2.6.11-r2.ebuild
+++ b/media-gfx/gimp/gimp-2.6.11-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild,v 1.1 2011/04/19 20:08:45 hanno Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/gimp/gimp-2.6.11-r2.ebuild,v 1.2 2011/07/30 16:03:01 angelos Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2:2.5"
@@ -94,6 +94,10 @@ src_prepare() {
 	# https://bugzilla.gnome.org/show_bug.cgi?id=640409
 	epatch "${FILESDIR}"/gimp-libpng15-v2.diff
 
+	# don't use empty, removed header
+	# https://bugs.gentoo.org/show_bug.cgi?id=377075
+	epatch "${FILESDIR}"/gimp-curl-headers.diff
+
 	echo '#!/bin/sh' > py-compile
 	gnome2_src_prepare
 }