summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDoug Goldstein <cardoe@gentoo.org>2010-02-08 05:17:23 +0000
committerDoug Goldstein <cardoe@gentoo.org>2010-02-08 05:17:23 +0000
commitcf1802e826155e6815d4266ba9815bfefc5be51b (patch)
tree170a9bac1353af11f5bffdc5b61f5db7e12a38d7 /x11-libs/cairo
parentAdd prefix keywords. (diff)
downloadhistorical-cf1802e826155e6815d4266ba9815bfefc5be51b.tar.gz
historical-cf1802e826155e6815d4266ba9815bfefc5be51b.tar.bz2
historical-cf1802e826155e6815d4266ba9815bfefc5be51b.zip
remove all older versions
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
Diffstat (limited to 'x11-libs/cairo')
-rw-r--r--x11-libs/cairo/ChangeLog7
-rw-r--r--x11-libs/cairo/Manifest10
-rw-r--r--x11-libs/cairo/cairo-1.4.14.ebuild71
-rw-r--r--x11-libs/cairo/cairo-1.6.4-r1.ebuild83
-rw-r--r--x11-libs/cairo/cairo-1.8.6-r1.ebuild102
-rw-r--r--x11-libs/cairo/files/cairo-1.6.4-libpng-api-change.patch27
-rw-r--r--x11-libs/cairo/files/cairo-1.8.6-status-return-fix.patch22
7 files changed, 7 insertions, 315 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/Manifest b/x11-libs/cairo/Manifest
index 88f5b881415d..989ad44d2e14 100644
--- a/x11-libs/cairo/Manifest
+++ b/x11-libs/cairo/Manifest
@@ -1,14 +1,6 @@
AUX cairo-1.2.4-lcd-cleartype-like.diff 7244 RMD160 e50d5bf17cbead688a8b808a78fe4104c09af52e SHA1 f63131fd75bb496db59e3ce6bc755bbfb70baacb SHA256 4926d20d2b6b5071a5bf9ee9a12a36fef69510ebebd717c1dab151fe650f173a
-AUX cairo-1.6.4-libpng-api-change.patch 799 RMD160 407e2bdbaa1624c2b70c4837eb872b84d48086e6 SHA1 aac038b81fba395b68b27c64814e19bbc1e8826d SHA256 82cf3e542f46b6c07dc32b16c622c0b15bb356f5069b34a9d1cdbd4b4d7481f4
-AUX cairo-1.8.6-status-return-fix.patch 784 RMD160 cfa21d49438ad4493fd27f619c2ec3286dc4ce97 SHA1 448a1a5c188ac8543c410700dfefa7938c37fcb5 SHA256 9ac4c13454d7ba44a4e3998bf1e25ff3b6dc937885e2f5275de74b9a825bf056
AUX cairo-1.8.8-interix.patch 619 RMD160 9bb28c5a88aa1f2776d32ac7020aef4ba93872b5 SHA1 857a4d2be0118a6d2d0d80388b5963a5f768341d SHA256 505be82a1a0b7f963cb49ff85ecf1fa1389a4e43621df76b91fc1529616b2299
-DIST cairo-1.4.14.tar.gz 3283608 RMD160 9e7c87a292c889b06b29e9622be0a7daa3ddd6fd SHA1 63310243ba8af949060b06c01fc28ee5471ed5a4 SHA256 8914f9c34a77bf9d908b0c617c2d7ffebdd6d1e855cfd367d2a1b3d677f22e3c
-DIST cairo-1.6.4.tar.gz 5042623 RMD160 ccae736a40d985b72bda7c2f0a98a0838020658e SHA1 9d990fe39a125ceb07221623c237cd7015855d5c SHA256 7f0ce28c358706913bc39e6930a18ae89f3b9a6aa17998faa2b59d1e0e2b4f42
-DIST cairo-1.8.6.tar.gz 6616544 RMD160 2374236afabbe248a642bf1cac6a5996f64bed62 SHA1 d1e5479d4eeb7b1a3589672e3ef8f4899e7c5eba SHA256 93a347af0cecf258be8fb54265b16a0fb16317df4a32896141d2987c30773535
DIST cairo-1.8.8.tar.gz 6646082 RMD160 78af536ebaaffc608114b626b22fc9a20cff3750 SHA1 e4b8b219427d1ca3dc95f5f44914dce1ae0c3766 SHA256 3c51d3de5dc4596e01a6675acd3c86c2c99c00f02e8fad5493758a29fe451c90
-EBUILD cairo-1.4.14.ebuild 1970 RMD160 0e4e5bd351fb6abd816b446e3556b628e88ef003 SHA1 032284f0d54252fe14d7eced9e4ebb5b87d4e727 SHA256 e69b9626809f4462dc9ba7d79b1494551e6675f062987436e51d0d72aba85876
-EBUILD cairo-1.6.4-r1.ebuild 2285 RMD160 2b1fee38aa461cfb7cc5cb0bc819735e154f2392 SHA1 7fe1d1697203fc44845aad8c3d8d157d8251f680 SHA256 1be22a3f9f761680e5421552ea04d949e7b6ce814ac87a0680c07509c4b3424e
-EBUILD cairo-1.8.6-r1.ebuild 3039 RMD160 5981eb005515146b7743cc07943702543d9389c5 SHA1 9c12725041596e1ae6d677b923d545bc01e74e50 SHA256 535750c742fdd18b259e019c11a01e195b2b0dddc6e5442d95dc0073d91aa987
EBUILD cairo-1.8.8.ebuild 3257 RMD160 ed5ce224cb55b6b87be62bb5f5478fc40019d797 SHA1 48ba6fbbcf78b28fa0cd22d856b8064b4c2c18d6 SHA256 757af26c5490be4ad2f0b35d3dfa355682ae8f753001b9d7a712a947257c334b
-MISC ChangeLog 32404 RMD160 184d0797100a3eee4c5510c9bc31a93f2e1be80f SHA1 88fb040c7b0e89b480329ba60a957b057c4704b8 SHA256 ec49f8420426d15514ab26b2c3fa0ae48185422f4db22a07900f90db38903a4a
+MISC ChangeLog 32644 RMD160 c657181161a36797a7232c469644a8917d0d6276 SHA1 107a69060cbe30c66bd609255adf794a957d64e9 SHA256 108270ee24c5b48d8a4a1310c9518b17638b1564b7191bf9a1997a205d6026e6
MISC metadata.xml 628 RMD160 589b0a5e55683527204892191462856d90661d4e SHA1 b0f6e67dffc97e5c0ed9acea7448cd5f92e36c41 SHA256 802fcf2d639a4125475acd325ebfa874ef3e89055e02636968baa9fa6fc5e406
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