diff options
| author |   Christoph Mende <angelos@gentoo.org> | 2011-07-29 06:40:00 +0000 |
|---|---|---|
| committer | Christoph Mende <angelos@gentoo.org> | 2011-07-29 06:40:00 +0000 |
| commit | 4119bf0a81b1b78f81f5adf87e8a227fecaa5a2d (patch) | |
| tree | 409fcda1829d766f516427d1ea3355d816ef2150 /app-admin | |
| parent | USE="static-libs" and remove unnecessary libtool archive. Missing dev-lang/pe... (diff) | |
| download | gentoo-2-4119bf0a81b1b78f81f5adf87e8a227fecaa5a2d.tar.gz gentoo-2-4119bf0a81b1b78f81f5adf87e8a227fecaa5a2d.tar.bz2 gentoo-2-4119bf0a81b1b78f81f5adf87e8a227fecaa5a2d.zip | |
Fix compilation against curl-7.21.7 (bug #376833)
(Portage version: 2.2.0_alpha47/cvs/Linux x86_64)
Diffstat (limited to 'app-admin')
| -rw-r--r-- | app-admin/conky/ChangeLog | 6 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.8.0-r1.ebuild | 7 | ||||
| -rw-r--r-- | app-admin/conky/conky-1.8.1-r2.ebuild | 11 | ||||
| -rw-r--r-- | app-admin/conky/files/conky-1.8.1-curl-headers.patch | 24 |
4 files changed, 39 insertions, 9 deletions
diff --git a/app-admin/conky/ChangeLog b/app-admin/conky/ChangeLog index 9b2cac75f500..524a4ad7e1ef 100644 --- a/app-admin/conky/ChangeLog +++ b/app-admin/conky/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-admin/conky # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.163 2011/07/20 13:37:22 pacho Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/ChangeLog,v 1.164 2011/07/29 06:40:00 angelos Exp $ + + 29 Jul 2011; Christoph Mende <angelos@gentoo.org> conky-1.8.0-r1.ebuild, + conky-1.8.1-r2.ebuild, +files/conky-1.8.1-curl-headers.patch: + Fix compilation against curl-7.21.7 (bug #376833) 20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml: Drop maintainer due retirement, bug #34534 diff --git a/app-admin/conky/conky-1.8.0-r1.ebuild b/app-admin/conky/conky-1.8.0-r1.ebuild index 427624c74533..dbcb144452f1 100644 --- a/app-admin/conky/conky-1.8.0-r1.ebuild +++ b/app-admin/conky/conky-1.8.0-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r1.ebuild,v 1.8 2010/11/06 01:42:29 rafaelmartins Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.0-r1.ebuild,v 1.9 2011/07/29 06:40:00 angelos Exp $ EAPI="2" @@ -53,7 +53,8 @@ DEPEND=" src_prepare() { epatch "${FILESDIR}/conky-1.8.0-ncurses.patch" \ - "${FILESDIR}/conky-1.8.0-audacious-2.3.patch" + "${FILESDIR}/conky-1.8.0-audacious-2.3.patch" \ + "${FILESDIR}/${PN}-1.8.1-curl-headers.patch" eautoreconf } diff --git a/app-admin/conky/conky-1.8.1-r2.ebuild b/app-admin/conky/conky-1.8.1-r2.ebuild index cc08c8f35c9b..4e31a8cce1ff 100644 --- a/app-admin/conky/conky-1.8.1-r2.ebuild +++ b/app-admin/conky/conky-1.8.1-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/app-admin/conky/conky-1.8.1-r2.ebuild,v 1.6 2011/03/06 12:11:08 klausman Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/conky/conky-1.8.1-r2.ebuild,v 1.7 2011/07/29 06:40:00 angelos Exp $ EAPI=2 @@ -53,10 +53,11 @@ DEPEND=" " src_prepare() { - epatch "${FILESDIR}/${P}-nvidia-x.patch" - epatch "${FILESDIR}/${P}-xmms2.patch" - epatch "${FILESDIR}/${P}-secunia-SA43225.patch" - epatch "${FILESDIR}/${P}-acpitemp.patch" + epatch "${FILESDIR}/${P}-nvidia-x.patch" \ + "${FILESDIR}/${P}-xmms2.patch" \ + "${FILESDIR}/${P}-secunia-SA43225.patch" \ + "${FILESDIR}/${P}-acpitemp.patch" \ + "${FILESDIR}/${P}-curl-headers.patch" } src_configure() { diff --git a/app-admin/conky/files/conky-1.8.1-curl-headers.patch b/app-admin/conky/files/conky-1.8.1-curl-headers.patch new file mode 100644 index 000000000000..5de2de14e6fd --- /dev/null +++ b/app-admin/conky/files/conky-1.8.1-curl-headers.patch @@ -0,0 +1,24 @@ +diff --git a/src/ccurl_thread.c b/src/ccurl_thread.c +index 10e73a6..9bea299 100644 +--- a/src/ccurl_thread.c ++++ b/src/ccurl_thread.c +@@ -33,7 +33,6 @@ + #endif /* DEBUG */ + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + /* +diff --git a/src/eve.c b/src/eve.c +index dc07264..f62a5f6 100644 +--- a/src/eve.c ++++ b/src/eve.c +@@ -37,7 +37,6 @@ + #include <libxml/xmlwriter.h> + + #include <curl/curl.h> +-#include <curl/types.h> + #include <curl/easy.h> + + #include <time.h> |