From: Christoph Mende <angelos@gentoo.org>
Date: Mon, 25 Jul 2011 10:23:11 +0000 (+0000)
Subject: Fix compilation against curl-7.21.7 (bug #376109)
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b9019e6542427ee0f98f774bba6b1e5b168d14c2;p=gentoo.git

Fix compilation against curl-7.21.7 (bug #376109)

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

diff --git a/media-video/xine-ui/ChangeLog b/media-video/xine-ui/ChangeLog
index 277961cff3ef..58c6496e3b1f 100644
--- a/media-video/xine-ui/ChangeLog
+++ b/media-video/xine-ui/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/xine-ui
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.174 2011/02/16 14:56:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/ChangeLog,v 1.175 2011/07/25 10:23:11 angelos Exp $
+
+  25 Jul 2011; Christoph Mende <angelos@gentoo.org> xine-ui-0.99.6.ebuild,
+  +files/xine-ui-0.99.6-curl-headers.patch:
+  Fix compilation against curl-7.21.7 (bug #376109)
 
   16 Feb 2011; Alexis Ballier <aballier@gentoo.org> xine-ui-0.99.6.ebuild,
   +files/xine-ui-0.99.6-libpng15.patch:
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 84a2951759bb..0640086233bd 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
+AUX xine-ui-0.99.6-curl-headers.patch 258 RMD160 6e640504bb40556abc657cd32d1c76a3ed573a90 SHA1 a7fefc50116d5392e61113017b3b579d5afa1b72 SHA256 d6ed64e4409aea2f722b507035bbfd6be2fcd0dc219ecbab6254e1702f637e64
 AUX xine-ui-0.99.6-libpng15.patch 573 RMD160 ccc7e340d16900ea238ae1f2fb948982a67baa86 SHA1 bc7ec3153e61553dee8c0b6e04d1ca7cfe4a6f14 SHA256 dacd942a6a07cfb72858c2ad1fcd43382513c24575e5a8f96a016a5ccb4b8117
 DIST xine-ui-0.99.6.tar.xz 1797144 RMD160 b5d27f112d2ebb861d18be684c17c5fe0e7b7fbd SHA1 abbdb331898c14025ee6b132f63ab7d3c1b5b31e SHA256 4eb1e3eb6c2ebba70f2e215a15d8b99bb3e2b0449c94105dc16e963a99a59ef3
-EBUILD xine-ui-0.99.6.ebuild 2263 RMD160 5b4096c2a2818ed943806085ff394bc2e2b17a44 SHA1 1600de3cce949e42684450e2ff5d17dfe72058b5 SHA256 a6b0188daad5e60ea82a3880062f84091b6fb80d026cb150a7e8b69850e20db0
-MISC ChangeLog 26676 RMD160 917365c632d09875ae16225ac783adb66ace26d2 SHA1 ce65f236fbc621b31524d88e7b5e7112849d706b SHA256 0796b42d66dc78e084b4afd2efabe05b6a761c7203cbb353febded061f70d7c6
+EBUILD xine-ui-0.99.6.ebuild 2304 RMD160 2d7949b663368623ec454df93f1e04b240f7795e SHA1 bebf042a5038b4093d3918382e20b19f0e118aa5 SHA256 230d2b0df65a2f6ff5d58fc0485a2534493cf98793c81a5cafd9dece809bd98e
+MISC ChangeLog 26847 RMD160 9c92fd057b1a58b8246151f834e71289db0235f9 SHA1 9e368f53a15a3eac71cb606e10044695699dbca8 SHA256 1ba1408bc925be0281ad2da4826fb91db74e5bd3bb9cdbf83da6c3b38e0045b1
 MISC metadata.xml 314 RMD160 2d0d208be3d3423e72e81e07d4e52855d84decdc SHA1 4a5be7be171c292f138e645ecc3719912e00375e SHA256 7d249cbdf83d624b16eca3d7a1dd04db70b4f168197c904397d76f86200e96da
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk1b5a0ACgkQvFcC4BYPU0onBQCeJI8EjHJ+BMFlx7Bntg4/fFp7
-qKwAn2Y+X0wIZ6wA9emr1yCMU8SLOk1V
-=FUWo
+iF4EAREIAAYFAk4tRAkACgkQmWq1bYTyC0NHpwD/a4DiatCbntQLmTKONGm6qotx
+xQb6kdz5TyMwUbSgHVkA/3EomH/xzlCcHHyIEE+wAFQxL7OpaQgDc5Ofno06EuN5
+=UTSf
 -----END PGP SIGNATURE-----
diff --git a/media-video/xine-ui/files/xine-ui-0.99.6-curl-headers.patch b/media-video/xine-ui/files/xine-ui-0.99.6-curl-headers.patch
new file mode 100644
index 000000000000..0c90b74ea674
--- /dev/null
+++ b/media-video/xine-ui/files/xine-ui-0.99.6-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/src/xitk/download.c b/src/xitk/download.c
+index 99d8489..c83d0d1 100644
+--- a/src/xitk/download.c
++++ b/src/xitk/download.c
+@@ -28,7 +28,6 @@
+ 
+ #ifdef HAVE_CURL
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ #endif
+ 
diff --git a/media-video/xine-ui/xine-ui-0.99.6.ebuild b/media-video/xine-ui/xine-ui-0.99.6.ebuild
index 06251da64a4e..5bbcc3c19b17 100644
--- a/media-video/xine-ui/xine-ui-0.99.6.ebuild
+++ b/media-video/xine-ui/xine-ui-0.99.6.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-video/xine-ui/xine-ui-0.99.6.ebuild,v 1.12 2011/02/16 14:56:39 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/xine-ui/xine-ui-0.99.6.ebuild,v 1.13 2011/07/25 10:23:11 angelos Exp $
 
 EAPI=3
 inherit fdo-mime gnome2-utils eutils
@@ -43,7 +43,8 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	rm -f misc/xine-bugreport
-	epatch "${FILESDIR}/${P}-libpng15.patch"
+	epatch "${FILESDIR}/${P}-libpng15.patch" \
+		"${FILESDIR}/${P}-curl-headers.patch"
 }
 
 src_configure() {