Fix compilation against curl-7.21.7 (bug #376111)

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

diff --git a/media-libs/flickcurl/Manifest b/media-libs/flickcurl/Manifest
index 6d47efbdadba553504894d0eec6ca1b38115ef56..00b2389b3ad2cbdd30b14502f3c40387bdea56ae 100644 (file)
--- a/media-libs/flickcurl/Manifest
+++ b/media-libs/flickcurl/Manifest
@@ -1,18 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
+AUX flickcurl-1.21-curl-headers.patch 281 RMD160 fabea653f547a4796e2a46dc4ff52cff6de2e5d4 SHA1 c256d68721bd94cc58932f0412b3db972588f5b4 SHA256 8a440c4de997b7f3c033d54ef9be5bd89b31b19d9017da447b3405edba6ce022
 DIST flickcurl-1.21.tar.gz 1787529 RMD160 97f83d7894b29a756b9817458794a462ab445b88 SHA1 95cb98870d8d7c59a3f280a3029d70d253eb2ad0 SHA256 8e0e4473f799fa7e24133cb325c9f35f8295bdf55d88e0e915e00bb13ffbafa9
-EBUILD flickcurl-1.21.ebuild 1365 RMD160 083d5b9cefaf7fce1d6fe8d91f247ef89e36f218 SHA1 8e87fc33c7b80d97775ae593f90ae404ac947ced SHA256 be49d5c9867f43ad416e2518761e958c02930b75ba8eebd851a6c8a4dc3d2247
-MISC ChangeLog 370 RMD160 317dab81a70c81162bbccfc46d9d4c34f516a6c9 SHA1 fa2c3de01e184a0b5dff5214ed6e71f974408ce1 SHA256 8438e12e3e62fdd7be9f72ced6c630563312e9c5d00fded4c8e214f595bd9e22
+EBUILD flickcurl-1.21.ebuild 1417 RMD160 ae47ff2643ffa2b069bad26990b4beec270feb20 SHA1 6c0cf6394f2e71f589d6adc0f43a6d8ea7da5571 SHA256 1b3b48529a091a4d7e0a00a02480759cf3a5fb3286e429539dd0fbe672b59f94
+MISC ChangeLog 540 RMD160 ffe19a2940c5e98d204cb60607c42e96bd8fa12c SHA1 82cf00744378863fba6028ca43bd6f8b3adc6eac SHA256 1ee770afdf2e8b11ae3314a93fe0a70847d386595dbcf4cf561006b8a3f192b2
 MISC metadata.xml 266 RMD160 9cbf8f638bd524bd77a5bd8360c84b582c8465ae SHA1 802ece2fe73c05adef8b26670588e7defe0756a6 SHA256 36d34d2cf5805d4364822d952f9bd0ee2860eee3b851ce4cb616976c36567410
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBCgAGBQJOJ+PyAAoJEEqz6FtPBkyjfJ4H/29LOJ/eoZU5rZBil8SKnyzb
-oJEG8x2hWrhtk3P58JatTzb0qEUuUJOx4sduOSJ7/GDgP21HqBe1Jr6oxHiz8TpU
-D2y3He4sqjePizBsC7XPoiUPzjCDDvI16B4sbkZtiWPWfVKWNCl6qmf1pJTlOnBN
-qTxk6SsaxQMskkYwtT6t/GZyCzlzR4+2XxV085ti7WnIOFzH7gQglEngki3iusbl
-2kHUipiJb6YdTGNC2E5N7EbGUVASIoO9apdOAG7DoS2RiHEcEKMmt72v4pi4UoLQ
-lLMjINsVkDVxqCIFmEQu2sgMEbzC3RbuP//NbvKto6dlPtdjeU75oOOTQCXyafg=
-=Rl39
+iF4EAREIAAYFAk4tRVkACgkQmWq1bYTyC0PMFgEAiQTI/+mXnux0zVmvtzMuOKWr
+f0MilnKQSWIy4VGULD8BAKSKjc406JONu9fUdjulJcbpQjTVJcNVaXWB99uHQdQ/
+=Y/9c
 -----END PGP SIGNATURE-----

diff --git a/media-libs/tunepimp/ChangeLog b/media-libs/tunepimp/ChangeLog
index c4e58f27f8b805b0847bf25038860f61881dd9eb..8b95d35d7d72f3429a0b26617b581fccccce4b11 100644 (file)
--- a/media-libs/tunepimp/ChangeLog
+++ b/media-libs/tunepimp/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-libs/tunepimp
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/ChangeLog,v 1.77 2011/02/22 23:59:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/ChangeLog,v 1.78 2011/07/25 10:25:40 angelos Exp $
+
+  25 Jul 2011; Christoph Mende <angelos@gentoo.org> tunepimp-0.5.3-r3.ebuild,
+  +files/tunepimp-0.5.3-curl-headers.patch:
+  Fix compilation against curl-7.21.7 (bug #376111)
 
   22 Feb 2011; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org>
   tunepimp-0.5.3-r3.ebuild:

diff --git a/media-libs/tunepimp/Manifest b/media-libs/tunepimp/Manifest
index c6a9c38cc07235d9c52ee2abfad578889e84f777..b4a4cf71fe62e7d8453675db5d8d67b4d5b5c289 100644 (file)
--- a/media-libs/tunepimp/Manifest
+++ b/media-libs/tunepimp/Manifest
@@ -1,9 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX tunepimp-0.5.3-build-fix.patch 1996 RMD160 cee043ff0a2068123f47641537b99ede832827e9 SHA1 884d39899beec2dfecb77ae1a199fa2d4a084e6e SHA256 e848053e08c075c8df02fd2f48a93e9330bb790c7b8e48453c90e8e011a17e36
+AUX tunepimp-0.5.3-curl-headers.patch 276 RMD160 b59993dc6b9ca404db5b0dd667819471928e32ba SHA1 5798152ce0dae3620e752700319d9ae85947fc30 SHA256 a64b4c812de8802df46d449baeb755967e073f6512ec53befde8c7739442ee1b
 AUX tunepimp-0.5.3-gcc43.patch 4810 RMD160 a180a2a703083f940a2a1bb081018a3bfef320c6 SHA1 ac441ed5903621ebea70ec9e3f4b71f6781d4a05 SHA256 d248c1a84f2157b44e714982e239d2ed93731f39b5455130a3aef422ca48842d
 AUX tunepimp-0.5.3-gcc44.patch 473 RMD160 3f4b6d0cc213ffa7ff42b3b701ae5bc3d113a5d0 SHA1 b761a9733ee6d7d0fa81b22d5b6a2819fc446d0b SHA256 5329927dc730e77040a112448772bab190c5fd8db6a93041ce4266b2e3e57a03
 AUX tunepimp-0.5.3-libtool.patch 1169 RMD160 73479770ef2b9fc320de2ed3be2c6dbbf96a7b4c SHA1 ea28badda640e0de0c7d7d7229f3dbf3fd9f46f7 SHA256 7d9b29199b7186b7b57980fd5bcb08e26e0f13e4f989dc6b8ee04e968f919b40
 AUX tunepimp-0.5.3-new_libmp4v2.patch 852 RMD160 bd36a7ccc719762df6a847d592545f59cfde7c69 SHA1 1ee35ef6c0de85eb47558f3208f089dc3e926818 SHA256 c27fd67e2c570047be63febc7c0c3d9f95ed2d23f211e4d15514241218aa929c
 DIST libtunepimp-0.5.3.tar.gz 1097005 RMD160 6bc312591b98a5b74824fc3103137cbf60d4b012 SHA1 1b904cd97ce009588fe57336f40e79b6edf9947e SHA256 341744a0be386387632fc4bb906b97d2b3346137beb2c776a41dedaeeb0f2468
-EBUILD tunepimp-0.5.3-r3.ebuild 2186 RMD160 750faba06635ac9399eea1b133495a1bf7b656f8 SHA1 4987610ca892de5a87470fea2f0cf536f1d0f246 SHA256 9cd77f89181c740ed02f68c7917667c3f27adbb42d091cc222bf856dc452630e
-MISC ChangeLog 10197 RMD160 127fccab2df909aeea38d8ef00b67d5f454ac62a SHA1 808f80551f89bc8da61723048d1f4b7906bb919b SHA256 64a29cffd5f15b7d5721f1f62333d683767f038a462ac9a1e3447813888b0673
+EBUILD tunepimp-0.5.3-r3.ebuild 2227 RMD160 0893c255635d3f471766d81bc9eab2702399bdff SHA1 530e91ff457f8ca5e8c7627bcdaf561e232e08ab SHA256 038cd426233fa37073e4f51b79575b1f076f6f9a33450ae3a94f5e84e9e82264
+MISC ChangeLog 10371 RMD160 3d701a0d769ec702f6798a2d284e6975cef01e37 SHA1 4d4c7d7dd54d00da6a5dc848dbb21e7ad53a0f56 SHA256 84be0916153d186461b4fa82417d3cf04f9798dcd4ac26cdf70247d50c4a6a36
 MISC metadata.xml 156 RMD160 ecce3b981f150c45ae1e84e2d208e678d6124259 SHA1 b64f7c0b4e5db816d82ad19848f72118af129d35 SHA256 2f4da28506b9d4185f320f67a6191d30c7a921217ed4447ed46ea0bc4aefc79a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4tRJ4ACgkQmWq1bYTyC0MBGgEApxcTYPaGBSIV2uTWQ8kGC287
+c+Lq99SDu7xPYSsOzMQBAJa+Xsr5lYyuJqWnVh1+k5cElTzBSJx3hFQXVIFfOEs4
+=VXl2
+-----END PGP SIGNATURE-----

diff --git a/media-libs/tunepimp/files/tunepimp-0.5.3-curl-headers.patch b/media-libs/tunepimp/files/tunepimp-0.5.3-curl-headers.patch
new file mode 100644 (file)
index 0000000..15e059b
--- /dev/null
+++ b/media-libs/tunepimp/files/tunepimp-0.5.3-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/protocol.cpp b/lib/protocol.cpp
+index 3436f80..5adb2e5 100644
+--- a/lib/protocol.cpp
++++ b/lib/protocol.cpp
+@@ -13,7 +13,6 @@
+ #include <map>
+ #include <expat.h>
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+ using namespace std;
+ 

diff --git a/media-libs/tunepimp/tunepimp-0.5.3-r3.ebuild b/media-libs/tunepimp/tunepimp-0.5.3-r3.ebuild
index b8204086e555fe59e16173441048e8e750221439..52d3a64f87f1ff5dd4715c687cba0200ce659eb3 100644 (file)
--- a/media-libs/tunepimp/tunepimp-0.5.3-r3.ebuild
+++ b/media-libs/tunepimp/tunepimp-0.5.3-r3.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-libs/tunepimp/tunepimp-0.5.3-r3.ebuild,v 1.2 2011/02/22 23:59:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/tunepimp/tunepimp-0.5.3-r3.ebuild,v 1.3 2011/07/25 10:25:40 angelos Exp $
 
 EAPI="3"
 PYTHON_DEPEND="python? 2"
@@ -51,7 +51,8 @@ src_prepare() {
                "${FILESDIR}"/${P}-libtool.patch \
                "${FILESDIR}"/${P}-build-fix.patch \
                "${FILESDIR}"/${P}-gcc44.patch \
-               "${FILESDIR}"/${P}-new_libmp4v2.patch
+               "${FILESDIR}"/${P}-new_libmp4v2.patch \
+               "${FILESDIR}"/${P}-curl-headers.patch
 
        sed -i -e "s: tta::" configure.in || die "sed failed"