summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Mende <angelos@gentoo.org>2011-07-25 10:28:48 +0000
committerChristoph Mende <angelos@gentoo.org>2011-07-25 10:28:48 +0000
commitbb69b371780f8feeceb840506b354c8c0c536221 (patch)
treebfaae190be3773772404d4ef5e028bc6c5056e48
parentAdd a patch to fix parallel make bug, fix #374373 (diff)
downloadhistorical-bb69b371780f8feeceb840506b354c8c0c536221.tar.gz
historical-bb69b371780f8feeceb840506b354c8c0c536221.tar.bz2
historical-bb69b371780f8feeceb840506b354c8c0c536221.zip
Fix compilation against curl-7.21.7 (bug #376141)
Package-Manager: portage-2.2.0_alpha47/cvs/Linux x86_64
-rw-r--r--media-libs/flickcurl/ChangeLog6
-rw-r--r--media-libs/flickcurl/files/flickcurl-1.21-curl-headers.patch12
-rw-r--r--media-libs/flickcurl/flickcurl-1.21.ebuild6
-rw-r--r--media-libs/gmyth/Manifest15
4 files changed, 34 insertions, 5 deletions
diff --git a/media-libs/flickcurl/ChangeLog b/media-libs/flickcurl/ChangeLog
index 11eb06807450..9c05761ef8fd 100644
--- a/media-libs/flickcurl/ChangeLog
+++ b/media-libs/flickcurl/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/flickcurl
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flickcurl/ChangeLog,v 1.1 2011/07/21 08:31:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flickcurl/ChangeLog,v 1.2 2011/07/25 10:28:48 angelos Exp $
+
+ 25 Jul 2011; Christoph Mende <angelos@gentoo.org> flickcurl-1.21.ebuild,
+ +files/flickcurl-1.21-curl-headers.patch:
+ Fix compilation against curl-7.21.7 (bug #376141)
*flickcurl-1.21 (21 Jul 2011)
diff --git a/media-libs/flickcurl/files/flickcurl-1.21-curl-headers.patch b/media-libs/flickcurl/files/flickcurl-1.21-curl-headers.patch
new file mode 100644
index 000000000000..fd7fbb7d844e
--- /dev/null
+++ b/media-libs/flickcurl/files/flickcurl-1.21-curl-headers.patch
@@ -0,0 +1,12 @@
+diff --git a/src/flickcurl_internal.h b/src/flickcurl_internal.h
+index 0642edf..9fbde7b 100644
+--- a/src/flickcurl_internal.h
++++ b/src/flickcurl_internal.h
+@@ -24,7 +24,6 @@
+ #include <libxml/xpath.h>
+
+ #include <curl/curl.h>
+-#include <curl/types.h>
+ #include <curl/easy.h>
+
+
diff --git a/media-libs/flickcurl/flickcurl-1.21.ebuild b/media-libs/flickcurl/flickcurl-1.21.ebuild
index 7c9501dd325f..e815511b6ea2 100644
--- a/media-libs/flickcurl/flickcurl-1.21.ebuild
+++ b/media-libs/flickcurl/flickcurl-1.21.ebuild
@@ -1,10 +1,10 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/flickcurl/flickcurl-1.21.ebuild,v 1.1 2011/07/21 08:31:34 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/flickcurl/flickcurl-1.21.ebuild,v 1.2 2011/07/25 10:28:48 angelos Exp $
EAPI="4"
-inherit autotools
+inherit autotools eutils
DESCRIPTION="C library for the Flickr API"
HOMEPAGE="http://librdf.org/flickcurl/"
@@ -33,6 +33,8 @@ src_prepare() {
sed -i -e '/^TARGET_DIR/s:/$(DOC_MODULE)::' gtk-doc.make || die
fi
+ epatch "${FILESDIR}"/${P}-curl-headers.patch
+
eautoreconf
}
diff --git a/media-libs/gmyth/Manifest b/media-libs/gmyth/Manifest
index a03d5ee821e0..c4557b16ee8c 100644
--- a/media-libs/gmyth/Manifest
+++ b/media-libs/gmyth/Manifest
@@ -1,5 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
AUX gmyth-0.7-as-needed.patch 1410 RMD160 08452c184c0aa568f3f5c367f37a5fb4d46146fc SHA1 17ae686aa5cea2bd6dae27951680090e3e0a0fbd SHA256 1c78e1045348da2714b5b245daaadcf7fe2e4c9e5024ce39b224875d1f41b1ef
+AUX gmyth-0.7-curl-headers.patch 266 RMD160 cfda8db9cdf7e648ff29b52a6125c0aef692cb0b SHA1 b50cad5b8cb89321ba924b5f882699b5b0c86763 SHA256 f00e4404491d86a1fe975b7c9487b7004644e3c3fa982b58e07da346eeef5322
DIST gmyth_0.7-indt1.tar.gz 497877 RMD160 4d3bf33dd2468c505186a75841a91f1a79427086 SHA1 1f945c482a817da4fcd3faa1e09c587335725d65 SHA256 71f9680b9345f8a4342d1db007f3f0ca83bfaba83588b3751c93b77142a59e3b
-EBUILD gmyth-0.7.ebuild 936 RMD160 3d632fa40a5c64964433e89a302e6a7dd00838ef SHA1 893c15f979391ccca2f2ae1096f2f6ca46f30881 SHA256 e75f4dc54dbbbed39d12c4b1bda847a51e836329fdb1432cb901becc56c15755
-MISC ChangeLog 1164 RMD160 ad6ce236ac1687b75f6beb97f2aa67d36cac71aa SHA1 2fbc6ab7af36f2247172120e6ee88f78be7aa887 SHA256 8c8a942635913f17beceee374ac8321de22487bf2bac1472c59faa2e4aca2bd8
+EBUILD gmyth-0.7.ebuild 977 RMD160 6a3f5feac62e1fd1405766c90e4a40d0570ca1dd SHA1 01b473649ecdfd6dba2167660c648d030467e4e9 SHA256 9f186ffafbe5ffb8be81f5735fa9d6ae7312f47b520ae6e649fd4c6e77883a43
+MISC ChangeLog 1325 RMD160 daf558686cdf1b4e70dada5b3074ea2228a12db5 SHA1 42d34e454b3d496e287858208ebaed9f17ee4253 SHA256 3f786952b3e180dda65060f7ec03879e515df0f3e6fd1601719d507777f92891
MISC metadata.xml 162 RMD160 c6078d82a9ff46dbb283bc14ade9d117144cca67 SHA1 f46f8ccd62374b17183b5aca523c4dcf60d718f9 SHA256 3ac891ee23de8c6e2bef32e0c7aa3e6607e808de76ed723fbe7a1fb92f6093f1
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iF4EAREIAAYFAk4tRj0ACgkQmWq1bYTyC0N2VwD/cXLvZhQv2xi/iL9VtHWZsBji
+QMmSMt6I3e32dduU3LwA/RbaYzGa4KZKEmxiAZzSwNiA7qoDqiEm4LfFjP514P4o
+=x0Un
+-----END PGP SIGNATURE-----