diff options
author | Doug Goldstein <cardoe@gentoo.org> | 2010-02-08 05:17:23 +0000 |
---|---|---|
committer | Doug Goldstein <cardoe@gentoo.org> | 2010-02-08 05:17:23 +0000 |
commit | c50ec702df78637a3684730bc8dc9802b6f8d7a6 (patch) | |
tree | 4c26b0182bbcde6d1aab7c387d56b6cd0c393be8 /x11-libs/cairo | |
parent | Add prefix keywords. (diff) | |
download | gentoo-2-c50ec702df78637a3684730bc8dc9802b6f8d7a6.tar.gz gentoo-2-c50ec702df78637a3684730bc8dc9802b6f8d7a6.tar.bz2 gentoo-2-c50ec702df78637a3684730bc8dc9802b6f8d7a6.zip |
remove all older versions
(Portage version: 2.1.7.17/cvs/Linux x86_64)
Diffstat (limited to 'x11-libs/cairo')
-rw-r--r-- | x11-libs/cairo/ChangeLog | 7 | ||||
-rw-r--r-- | x11-libs/cairo/cairo-1.4.14.ebuild | 71 | ||||
-rw-r--r-- | x11-libs/cairo/cairo-1.6.4-r1.ebuild | 83 | ||||
-rw-r--r-- | x11-libs/cairo/cairo-1.8.6-r1.ebuild | 102 | ||||
-rw-r--r-- | x11-libs/cairo/files/cairo-1.6.4-libpng-api-change.patch | 27 | ||||
-rw-r--r-- | x11-libs/cairo/files/cairo-1.8.6-status-return-fix.patch | 22 |
6 files changed, 6 insertions, 306 deletions
diff --git a/x11-libs/cairo/ChangeLog b/x11-libs/cairo/ChangeLog index e77202bd9798..92791dc15b56 100644 --- a/x11-libs/cairo/ChangeLog +++ b/x11-libs/cairo/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for x11-libs/cairo # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.233 2010/01/17 05:14:18 robbat2 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/ChangeLog,v 1.234 2010/02/08 05:17:23 cardoe Exp $ + + 08 Feb 2010; Doug Goldstein <cardoe@gentoo.org> -cairo-1.4.14.ebuild, + -cairo-1.6.4-r1.ebuild, -files/cairo-1.6.4-libpng-api-change.patch, + -cairo-1.8.6-r1.ebuild, -files/cairo-1.8.6-status-return-fix.patch: + remove all older versions 17 Jan 2010; Robin H. Johnson <robbat2@gentoo.org> cairo-1.8.8.ebuild: Compile fails with only libtool 1.5 present. diff --git a/x11-libs/cairo/cairo-1.4.14.ebuild b/x11-libs/cairo/cairo-1.4.14.ebuild deleted file mode 100644 index 486cf7b38a5d..000000000000 --- a/x11-libs/cairo/cairo-1.4.14.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.4.14.ebuild,v 1.8 2009/01/05 13:26:13 remi Exp $ - -inherit eutils flag-o-matic libtool - -DESCRIPTION="A vector graphics library with cross-device output support" -HOMEPAGE="http://cairographics.org/" -SRC_URI="http://cairographics.org/releases/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="debug directfb doc glitz opengl svg X xcb" - -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it -RESTRICT="test" - -RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2.1.4 - media-libs/libpng - X? ( - x11-libs/libXrender - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXft - xcb? ( x11-libs/libxcb - x11-libs/xcb-util ) - ) - directfb? ( >=dev-libs/DirectFB-0.9.24 ) - glitz? ( >=media-libs/glitz-0.5.1 ) - svg? ( dev-libs/libxml2 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.19 - X? ( x11-proto/renderproto - xcb? ( x11-proto/xcb-proto ) ) - doc? ( - >=dev-util/gtk-doc-1.3 - ~app-text/docbook-xml-dtd-4.2 - )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # We need to run elibtoolize to ensure correct so versioning on FreeBSD - elibtoolize -} - -src_compile() { - #gets rid of fbmmx.c inlining warnings - append-flags -finline-limit=1200 - - if use glitz && use opengl; then - export glitz_LIBS=-lglitz-glx - fi - - econf $(use_enable X xlib) $(use_enable doc gtk-doc) $(use_enable directfb) \ - $(use_enable svg) $(use_enable glitz) \ - $(use_enable debug test-surfaces) --enable-pdf --enable-png \ - --enable-freetype --enable-ps $(use_enable xcb) \ - || die "configure failed" - - emake || die "compile failed" -} - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - dodoc AUTHORS ChangeLog NEWS README TODO -} diff --git a/x11-libs/cairo/cairo-1.6.4-r1.ebuild b/x11-libs/cairo/cairo-1.6.4-r1.ebuild deleted file mode 100644 index 868459556b89..000000000000 --- a/x11-libs/cairo/cairo-1.6.4-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.6.4-r1.ebuild,v 1.9 2009/01/05 13:26:13 remi Exp $ - -inherit eutils flag-o-matic libtool - -DESCRIPTION="A vector graphics library with cross-device output support" -HOMEPAGE="http://cairographics.org/" -SRC_URI="http://cairographics.org/releases/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="debug directfb doc glitz opengl svg test X xcb" - -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it -RESTRICT="test" - -RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2.1.9 - sys-libs/zlib - media-libs/libpng - >=x11-libs/pixman-0.10.0 - X? ( - x11-libs/libXrender - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXft - xcb? ( x11-libs/libxcb - x11-libs/xcb-util ) - ) - directfb? ( >=dev-libs/DirectFB-0.9.24 ) - glitz? ( >=media-libs/glitz-0.5.1 ) - svg? ( dev-libs/libxml2 )" - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.19 - X? ( x11-proto/renderproto - xcb? ( x11-proto/xcb-proto ) ) - doc? ( - >=dev-util/gtk-doc-1.6 - ~app-text/docbook-xml-dtd-4.2 - )" - -src_unpack() { - unpack ${A} - cd "${S}" - - # libpng's API changed as of 1.2.30, this is backwards compat with - # older libpng's as well. bug #235072 - epatch "${FILESDIR}"/${PN}-1.6.4-libpng-api-change.patch - - # We need to run elibtoolize to ensure correct so versioning on FreeBSD - elibtoolize -} - -src_compile() { - local use_xcb - - #gets rid of fbmmx.c inlining warnings - append-flags -finline-limit=1200 - - if use glitz && use opengl; then - export glitz_LIBS=-lglitz-glx - fi - - use_xcb="--disable-xcb" - use X && use xcb && use_xcb="--enable-xcb" - - econf $(use_enable X xlib) $(use_enable doc gtk-doc) \ - $(use_enable directfb) ${use_xcb} \ - $(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \ - $(use_enable debug test-surfaces) --enable-pdf --enable-png \ - --enable-freetype --enable-ps \ - || die "configure failed" - - emake || die "compile failed" -} - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - dodoc AUTHORS ChangeLog NEWS README -} diff --git a/x11-libs/cairo/cairo-1.8.6-r1.ebuild b/x11-libs/cairo/cairo-1.8.6-r1.ebuild deleted file mode 100644 index a308f2b05a0f..000000000000 --- a/x11-libs/cairo/cairo-1.8.6-r1.ebuild +++ /dev/null @@ -1,102 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-libs/cairo/cairo-1.8.6-r1.ebuild,v 1.9 2009/12/26 19:26:24 pva Exp $ - -inherit eutils flag-o-matic libtool - -DESCRIPTION="A vector graphics library with cross-device output support" -HOMEPAGE="http://cairographics.org/" -SRC_URI="http://cairographics.org/releases/${P}.tar.gz" - -LICENSE="|| ( LGPL-2.1 MPL-1.1 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd" -IUSE="cleartype debug directfb doc glitz opengl svg X xcb" - -# Test causes a circular depend on gtk+... since gtk+ needs cairo but test needs gtk+ so we need to block it -RESTRICT="test" - -RDEPEND="media-libs/fontconfig - >=media-libs/freetype-2.1.9 - sys-libs/zlib - media-libs/libpng - >=x11-libs/pixman-0.12.0 - directfb? ( >=dev-libs/DirectFB-0.9.24 ) - glitz? ( >=media-libs/glitz-0.5.1 ) - svg? ( dev-libs/libxml2 ) - X? ( >=x11-libs/libXrender-0.6 - x11-libs/libXext - x11-libs/libX11 - x11-libs/libXft ) - xcb? ( >=x11-libs/libxcb-0.92 - x11-libs/xcb-util )" -# test? ( -# pdf test -# x11-libs/pango -# >=x11-libs/gtk+-2.0 -# >=app-text/poppler-bindings-0.9.2 -# ps test -# app-text/ghostscript-gpl -# svg test -# >=x11-libs/gtk+-2.0 -# >=gnome-base/librsvg-2.15.0 - -DEPEND="${RDEPEND} - >=dev-util/pkgconfig-0.19 - doc? ( >=dev-util/gtk-doc-1.6 - ~app-text/docbook-xml-dtd-4.2 ) - X? ( x11-proto/renderproto ) - xcb? ( x11-proto/xcb-proto )" - -#pkg_setup() { -# if ! built_with_use app-text/poppler-bindings gtk ; then -# eerror 'poppler-bindings with gtk is required for the pdf backend' -# die 'poppler-bindings built without gtk support' -# fi -#} - -src_unpack() { - unpack ${A} - cd "${S}" - - epatch "${FILESDIR}"/${PN}-1.8.6-status-return-fix.patch - # ClearType-like patches applied by ArchLinux - use cleartype && epatch "${FILESDIR}"/cairo-1.2.4-lcd-cleartype-like.diff - - # We need to run elibtoolize to ensure correct so versioning on FreeBSD - elibtoolize -} - -src_compile() { - #gets rid of fbmmx.c inlining warnings - append-flags -finline-limit=1200 - - if use glitz && use opengl; then - export glitz_LIBS=$(pkg-config --libs glitz-glx) - fi - - econf $(use_enable X xlib) $(use_enable doc gtk-doc) \ - $(use_enable directfb) $(use_enable xcb) \ - $(use_enable svg) $(use_enable glitz) $(use_enable X xlib-xrender) \ - $(use_enable debug test-surfaces) --enable-pdf --enable-png \ - --enable-ft --enable-ps \ - || die "configure failed" - - emake || die "compile failed" -} - -src_install() { - make DESTDIR="${D}" install || die "Installation failed" - dodoc AUTHORS ChangeLog NEWS README -} - -pkg_postinst() { - if use xcb; then - ewarn "You have enabled the Cairo XCB backend which is used only by" - ewarn "a select few apps. The Cairo XCB backend is presently" - ewarn "un-maintained and needs a lot of work to get it caught up" - ewarn "to the Xrender and Xlib backends, which are the backends used" - ewarn "by most applications. See:" - ewarn "http://lists.freedesktop.org/archives/xcb/2008-December/004139.html" - fi -} diff --git a/x11-libs/cairo/files/cairo-1.6.4-libpng-api-change.patch b/x11-libs/cairo/files/cairo-1.6.4-libpng-api-change.patch deleted file mode 100644 index b67de786b361..000000000000 --- a/x11-libs/cairo/files/cairo-1.6.4-libpng-api-change.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru cairo-1.6.4/src/cairo-png.c cairo-1.6.4-mod/src/cairo-png.c ---- cairo-1.6.4/src/cairo-png.c 2008-04-11 17:07:25.000000000 -0400 -+++ cairo-1.6.4-mod/src/cairo-png.c 2008-08-19 17:19:36.682399853 -0400 -@@ -119,6 +119,14 @@ - } - - -+/* Starting with libpng-1.2.30, we must explicitly specify an output_flush_fn. -+ * Otherwise, we will segfault if we are writing to a stream. */ -+static void -+png_simple_output_flush_fn (png_structp png_ptr) -+{ -+ return; -+} -+ - static cairo_status_t - write_png (cairo_surface_t *surface, - png_rw_ptr write_func, -@@ -179,7 +187,7 @@ - goto BAIL3; - #endif - -- png_set_write_fn (png, closure, write_func, NULL); -+ png_set_write_fn (png, closure, write_func, png_simple_output_flush_fn); - - switch (image->format) { - case CAIRO_FORMAT_ARGB32: diff --git a/x11-libs/cairo/files/cairo-1.8.6-status-return-fix.patch b/x11-libs/cairo/files/cairo-1.8.6-status-return-fix.patch deleted file mode 100644 index a01233e58561..000000000000 --- a/x11-libs/cairo/files/cairo-1.8.6-status-return-fix.patch +++ /dev/null @@ -1,22 +0,0 @@ -From efa9e1088cbf1b5331cc0bab3348520f3b91ae4b Mon Sep 17 00:00:00 2001 -From: M Joonas Pihlaja <jpihlaja@cc.helsinki.fi> -Date: Thu, 13 Nov 2008 10:11:12 +0000 -Subject: [clip] Fix uninitialised status return in _cairo_clip_intersect_mask() for empty extents. - -This fixes the clip-all test case crashing for me. ---- -diff --git a/src/cairo-clip.c b/src/cairo-clip.c -index 5bbffd7..726896e 100644 ---- a/src/cairo-clip.c -+++ b/src/cairo-clip.c -@@ -423,7 +423,7 @@ _cairo_clip_intersect_mask (cairo_clip_t *clip, - cairo_box_t extents; - cairo_rectangle_int_t surface_rect, target_rect; - cairo_surface_t *surface = NULL; -- cairo_status_t status; -+ cairo_status_t status = CAIRO_STATUS_SUCCESS; - - if (clip->all_clipped) - return CAIRO_STATUS_SUCCESS; --- -cgit v0.8.2 |