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
commit41523d5dc4146e1b53bfaf28840eff20867273cd (patch)
treee5adca0fbef8ac1f5490e324ff63671fc643cf06 /media-libs/flickcurl
parentAdd a patch to fix parallel make bug, fix #374373 (diff)
downloadgentoo-2-41523d5dc4146e1b53bfaf28840eff20867273cd.tar.gz
gentoo-2-41523d5dc4146e1b53bfaf28840eff20867273cd.tar.bz2
gentoo-2-41523d5dc4146e1b53bfaf28840eff20867273cd.zip
Fix compilation against curl-7.21.7 (bug #376141)
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/flickcurl')
-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
3 files changed, 21 insertions, 3 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
}