From: Christoph Mende <angelos@gentoo.org>
Date: Sat, 30 Jul 2011 16:03:01 +0000 (+0000)
Subject: Fix compilation against curl-7.21.7 (bug #377075)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=ac57aa9aa86ff0791aab864955508a6cdf162490;p=gentoo.git

Fix compilation against curl-7.21.7 (bug #377075)

Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64
---

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/Manifest b/media-gfx/gimp/Manifest
index 09fc8ddc5dcf..9f649c5522d4 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -2,28 +2,19 @@
 Hash: SHA256
 
 AUX gimp-CVE-2010-4540-to-4543.diff 5678 RMD160 0947a979ae64b2520967a6e8c3493aa37e425c3d SHA1 9b9cae60c775d4312552434373618c6cb9188e3e SHA256 b1fb9d83959cfc8e7a1ebf5d8812454686d618463010bbc0e802a1476e58305f
+AUX gimp-curl-headers.diff 358 RMD160 b3c5d4120a203280ae9625a11de0ff5d3330dbc3 SHA1 46f694eb7d01a9d952e5651bb8c2ec22c62ccbd4 SHA256 34c706af2ba690be90ef6d0f68fef552b90fdf3a6ff0290e7d5fc02024b76b6f
 AUX gimp-libpng15-v2.diff 18466 RMD160 fc9490eb1525841c19236b4141f9adbdd0c3a273 SHA1 6d0b91b0aa107cba7a0592d0d523a22a1a67b124 SHA256 d3a4f0b365497adf1eaeaf6b4ecb5eff5517eb0ce4373ef15da0e4cece5703aa
 AUX gimp-libpng15.diff 17119 RMD160 c04595754b3b3bf2631ab834261d14d7debb08ca SHA1 a56e8dc7e7d9df47d582285effa94b25e552093f SHA256 d77b61592d4943b052200eb98305b6cd15c24259b538c9a56afa498328470086
 DIST gimp-2.6.11.tar.bz2 16473561 RMD160 a116377499e58dc2bfe231ab3c057d0be94091ff SHA1 2f9d596e727bdbf304fa78257c1731d9faf3934c SHA256 9b6d08d0803b3912ea596d1b77b9c21ee13778c23388a225c004b8c1587cb0a1
-EBUILD gimp-2.6.11-r1.ebuild 3119 RMD160 d31d0e457e83953818f8ec71629da91d40017b3c SHA1 cc9b300e15152b39f9d1a88c045ed73771f8213e SHA256 d0d72a6c2ca9af4326d50f98d367d2098672448a11ef5fb56bcfd64ec6a2f294
-EBUILD gimp-2.6.11-r2.ebuild 3126 RMD160 c409d3e6703173282bcd9ebe8a8be3f7c16ce73a SHA1 db7dd508f0bc739284d58e6ae4aaa0b089ba8341 SHA256 527664a2e4ad0d5ac251f328aff11550e814cc6844de3c839b07d1bd96ca050b
+EBUILD gimp-2.6.11-r1.ebuild 3248 RMD160 324ff1505eeed9d839cc9695df3289dff0e5bf6e SHA1 b163b4ce5567abeb087b4f50eb4bfc2bb431a040 SHA256 07c2eafd3ce4e49f05a7b154b30be3f40a069e6617e1538c5e97d901dc424925
+EBUILD gimp-2.6.11-r2.ebuild 3259 RMD160 0f869b84f27b578b0c50da27545afc724ec236fc SHA1 4159ab5be4c896576ab9ca18d5b68b544665d23a SHA256 437a9aeff3e6c03814f0ce2912b8037e2005876aee294be79804a7765aa29180
 EBUILD gimp-9999.ebuild 2926 RMD160 d7b2dfddc0a5cf41bf88dadb4c1481a89f553672 SHA1 13b14286a21bf8e5f1f1a7b3a5e40391e1e14c86 SHA256 98689de8be260bb36b07fd8db09a4d190dae7ff920ca0f5e112eff3168de8d60
-MISC ChangeLog 44834 RMD160 294c99e08ef00b13ed793f06231caf0402518eae SHA1 eb0dedc76b853b62e928d5cec474ac51fbff60bc SHA256 0925551688281ee670dcf3133bcef30463e0f07230f1eecc716d08b610a5e77c
+MISC ChangeLog 45020 RMD160 c71896b200e85dba33abffc322e80b4a2f28bd03 SHA1 dd46eebfeb17e79a63d6084a629401b50f59bf8a SHA256 dbf8ae40f102575765411ef4b41f315cae8fee8c96e2ac97033e3421e57fe7e8
 MISC metadata.xml 366 RMD160 5ae566a82314bb47784051f6ca13fc1a9ecd137e SHA1 dce399814102ba9802439497439e2e00ecc3b82e SHA256 380bccccb72b527f81e02fd37b41b584316fcd7c802b959b8eae27fcef0c0db5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNrevSAAoJEKWIAHK7tR5CpxIP/2HQKI4PYe01AbMbf6EGPnxA
-JbxxeMIzWeQT2yqXUtoQawqiRuuoKkmsrnSjkkfB3XLxHo83nmyvM0yYGsdok0bf
-YRp52YHkY73YrpTt122Gyxjr8V6taanpn9XU3ADYd0ydG5FQwvBMHsyVU4P/e2qm
-WkZctWfl0K+rz5r8gAm/JPHV+M4nKLuxWVNcGBsIH/fYO+7zcXzScb+fwuRwU74/
-DIlSOOVi4UFcUhndOKAnrRbraTvgcNyuUNRa10AlAZ0NudlxAu31FPXkLBJ7Wh6Y
-J7WS8qRevdegAKte9dFw2miGhDAOBUKjrkSaUhuAX8qu3p4fGDuCvN+x7B90uhXJ
-9gUlPnmk+mS3to6Ro5W5o3yAav8uVNn2SAO5OqhJXzD0vWNf7k3NQToCC8gSJMeO
-SkAVe0qiPEVxJosejLSU8wnTuYu9XQ2le0rMaxjY66P1xVvmev5V/lIEmYcegGJQ
-LLQaWlDWgMkOUOEWtsA9ehFzKUB7nLXZGue7KKCS4Dvb9LQYsdqgbRLaEoYLWme/
-k5f2HAXj5uH22DUjKJjz2KOZit/lfmxXK+SqD6OLOxW+EkXUaoe3FjPgh5heVIxF
-e8n2nfES1EVGUnB6SkAKnTOut0mmcNIEBL2+zpDnTIRM6vtxHXBw2RcdsavFN1za
-X3Zr83mBwX9Uw+DMldSz
-=HAsB
+iF4EAREIAAYFAk40KyYACgkQmWq1bYTyC0MN0wD/TTcWE4BXJizGMC3gRV67VmVo
+iYm0Jhn6Zkzcejqr/2UA/R+NPzfVTLsmLYgTm2s7AH2UaRAN2fbc4HmRx/K84Sbr
+=LcXu
 -----END PGP SIGNATURE-----
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
 }